-
Notifications
You must be signed in to change notification settings - Fork 5
Safer clean #115
base: master
Are you sure you want to change the base?
Safer clean #115
Changes from 3 commits
4311bed
b953708
d56a3fc
31c9127
442012d
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -35,8 +35,12 @@ CONFIG_VARS = curl -fsL https://ft-next-config-vars.herokuapp.com/$1/$(call APP_ | |
|
||
# clean | ||
clea%: | ||
# HACK: Can't use -e option here because it's not supported by our Jenkins | ||
@git clean -fxd | ||
# clean just untracked files if not on CircleCI | ||
@if [ -z $(CIRCLECI) ]; then git clean -Xfd; else git clean -xfd; fi | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Isn't this logic inverted? I.e. We only want to clean There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @phamann the so, when That what we want, right? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Yep :) so my only comment now is that the conditional is confusing (at least for me). Can it instead read:
|
||
@$(DONE) | ||
|
||
cleanx: | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This will have to be named something different because on the There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Oh actually it turns out it doesn't (a fully specified name does take precedence) buuut I would still call it something else like There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @leggsimon the peace hippy that I am, I feel it my duty to encourage people not to nuke... There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. You're the one that wants it 😉 There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. But seriously I think it should be more clearly different There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. @leggsimon any suggestion for an alternative word to nuke? Preferably one that isn't violent... and 3 or 4 letters There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Great ideas, @leggsimon I really like the I think we're good to go now? |
||
@git clean -xfd | ||
@$(DONE) | ||
|
||
# install | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
"clean just gitignored files if not on CircleCI"