vagrant: Fix build in dev. VM #11388
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The build script run inside the dev. VM was inadvertently broken when moved from common/ to pkg/common/. This commit fixes that and moves that script to contrib/vagrant/; since only the dev. VM uses that script it makes more sense to have it with other dev. scripts. Fixes: 3c784c7 ("Move all 'common' code to 'pkg'") Signed-off-by: Paul Chaignon <paul@cilium.io>
This comment has been minimized.
This comment has been minimized.
pchaigno
added
the
release-note/misc
aanm
approved these changes
May 7, 2020
rolinh
approved these changes
May 7, 2020
joestringer
reviewed
May 7, 2020
| @@ -65,7 +65,7 @@ set -o pipefail | |||
|
|
|||
| export PATH=/home/vagrant/go/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games | |||
| #{$makeclean} | |||
| ~/go/src/github.com/cilium/cilium/pkg/common/build.sh | |||
| ~/go/src/github.com/cilium/cilium/contrib/vagrant/build.sh | |||
There was a problem hiding this comment.
🤯 I didn't even think that script was used. Thanks for the fix!
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The build script run inside the dev. VM was inadvertently broken when moved from
common/topkg/common/. This pull request fixes that and moves that script tocontrib/vagrant/; since only the dev. VM uses that script it makes more sense to have it with other dev. scripts.Fixes: #11331
/cc @rolinh @soumynathan