Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Makefile: Don't clobber an existing bots checkout #232

Merged
merged 1 commit into from
Oct 1, 2019

Conversation

martinpitt
Copy link
Member

@martinpitt martinpitt commented Oct 1, 2019

Commit 95b2aff was a thinko -- for our CI we don't want our test to
clobber a pre-existing bots/ checkout, as we often use this to run tests
against an updated image or to validate a changes to the bots project.

On developer machines, bots may also be a symlink to an actual bots
directory in development, so don't clobber that.

Commit 95b2aff was a thinko -- for our CI we *don't* want our test to
clobber a pre-existing bots/ checkout, as we often use this to run tests
against an updated image or to validate a changes to the bots project.

On developer machines, bots may also be a symlink to an actual bots
directory in development, so don't clobber that.
@martinpitt
Copy link
Member Author

The test log proves that it does not check out bots any more (make-checkout already did that).

@croissanne croissanne merged commit d43845c into cockpit-project:master Oct 1, 2019
@martinpitt martinpitt deleted the bots-clobber branch October 1, 2019 21:01
martinpitt added a commit to weldr/lorax that referenced this pull request Oct 14, 2019
Commit 4643afa was a thinko -- for our CI we *don't* want our test to
clobber a pre-existing bots/ checkout, as we often use this to run tests
against an updated image or to validate a changes to the bots project.

On developer machines, bots may also be a symlink to an actual bots
directory in development, so don't clobber that.

Stop making "bots" a phony target, and drop the now unnecessary
`[ -d bots ]` check.

Adapted from cockpit-project/starter-kit#232
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants