Skip to content
This repository has been archived by the owner on Sep 9, 2020. It is now read-only.

hack/validate-vendor.bash: fix build dep & script without TRAVIS_BRANCH #369

Merged
merged 1 commit into from
Apr 16, 2017

Conversation

jessfraz
Copy link
Contributor

This removes TRAVIS_BRANCH so the script works the same locally as in Travis. Also fixes "build dep" to run ensure since the command code was moved to cmd/dep.

go build
./dep ensure
go install ./cmd/dep
dep ensure
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Depending on how PATH is setup, this isn't guaranteed to use the binary we just built. Can we fix the build command and continue using ./dep?


IFS=$'\n'
files=( $(git diff "$TRAVIS_BRANCH...$VALIDATE_HEAD" --diff-filter=ACMR --name-only -- 'manifest.json' 'lock.json' 'vendor/' || true) )
files=( $(validate_diff --diff-filter=ACMR --name-only -- 'manifest.json' 'lock.json' 'vendor/' || true) )
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Since #342 was just merged, this should be updated to manifest.json -> Gopkg.toml and lock.json -> Gopkg.lock.

Copy link
Collaborator

@carolynvs carolynvs left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yay! 🎉 So happy to have this fixed to work locally.

@jessfraz jessfraz force-pushed the fix-vendor branch 2 times, most recently from b3f1bdd to 33cddec Compare April 13, 2017 16:05
@jessfraz
Copy link
Contributor Author

updated, thanks!

Copy link
Collaborator

@carolynvs carolynvs left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Life goal of reviewing a role model's code accomplished! :shipit:

@jessfraz
Copy link
Contributor Author

omg 😍 I am not that cool you will soon see, but <3

@carolynvs
Copy link
Collaborator

😛 Whatevs, you cannot stop my fangirl squee power.

Copy link
Member

@sdboyer sdboyer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

confoozled

unset IFS

if [ ${#files[@]} -gt 0 ]; then
# We run ensure to and see if we have a diff afterwards
go build
go install ./cmd/dep
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

err wait i'm confused, won't this still install to GOPATH/bin, rather than the current dir? shouldn't it be go build ./cmd/dep?

@jessfraz
Copy link
Contributor Author

jessfraz commented Apr 14, 2017 via email

Signed-off-by: Jess Frazelle <acidburn@google.com>
@sdboyer
Copy link
Member

sdboyer commented Apr 16, 2017

OK I think we're good now, mergey merge time

@sdboyer sdboyer merged commit 4610b1a into golang:master Apr 16, 2017
@jessfraz jessfraz deleted the fix-vendor branch April 16, 2017 23:07
ibrasho pushed a commit to ibrasho-forks/dep that referenced this pull request May 10, 2017
hack/validate-vendor.bash: fix build dep & script without TRAVIS_BRANCH
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants