diff --git a/.travis.yml b/.travis.yml index 1acc62691..1e93e25f8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,9 +31,9 @@ before_deploy: - mkdir dist - make deb-pkg rpm-pkg - mv *.deb *.rpm dist/ - - GOOS=darwin CGO_ENABLED=0 go build -o dist/sops-${TRAVIS_TAG}.darwin go.mozilla.org/sops/cmd/sops - - GOOS=windows CGO_ENABLED=0 go build -o dist/sops-${TRAVIS_TAG}.exe go.mozilla.org/sops/cmd/sops - - GOOS=linux CGO_ENABLED=0 go build -o dist/sops-${TRAVIS_TAG}.linux go.mozilla.org/sops/cmd/sops + - GOOS=darwin CGO_ENABLED=0 go build -mod vendor -o dist/sops-${TRAVIS_TAG}.darwin go.mozilla.org/sops/cmd/sops + - GOOS=windows CGO_ENABLED=0 go build -mod vendor -o dist/sops-${TRAVIS_TAG}.exe go.mozilla.org/sops/cmd/sops + - GOOS=linux CGO_ENABLED=0 go build -mod vendor -o dist/sops-${TRAVIS_TAG}.linux go.mozilla.org/sops/cmd/sops - | if [ ! -z "$TRAVIS_TAG" ]; then version="$(grep '^const Version' version/version.go |cut -d '"' -f 2)" diff --git a/Makefile b/Makefile index 6dbe42d5a..443fc7116 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,7 @@ all: test vet generate install functional-tests origin-build: test vet generate install functional-tests-all install: - $(GO) install go.mozilla.org/sops/cmd/sops + $(GO) install -mod vendor go.mozilla.org/sops/cmd/sops tag: all git tag -s $(TAGVER) -a -m "$(TAGMSG)" @@ -39,7 +39,7 @@ generate: keyservice/keyservice.pb.go protoc --go_out=plugins=grpc:. $< functional-tests: - $(GO) build -o functional-tests/sops go.mozilla.org/sops/cmd/sops + $(GO) build -mod vendor -o functional-tests/sops go.mozilla.org/sops/cmd/sops cd functional-tests && cargo test # Ignored tests are ones that require external services (e.g. AWS KMS)