public/atlantis
1
0
Fork 0
mirror of https://git.vectorsigma.ru/public/atlantis.git synced 2026-07-28 20:28:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use -mod=vendor for building

Browse Source
This commit is contained in:
Luke Kysow
2019-08-26 18:39:30 +02:00
parent b81fe9a5e5
commit fe84240d72
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
.circleci/config.yml
View File

@@ -1,9 +1,10 @@
version: 2 version: 2
jobs: jobs:
test: test:
working_directory: /go/src/github.com/runatlantis/atlantis
docker: docker:
- image: runatlantis/testing-env:latest - image: runatlantis/testing-env:latest
environment:
GOFLAGS: "-mod=vendor"
steps: steps:
- checkout - checkout
- run: make test-coverage - run: make test-coverage
@@ -13,7 +14,6 @@ jobs:
- run: make check-fmt - run: make check-fmt
- run: make check-lint - run: make check-lint
e2e: e2e:
working_directory: /go/src/github.com/runatlantis/atlantis
docker: docker:
- image: circleci/golang:1.12 - image: circleci/golang:1.12
environment: environment:
@@ -22,6 +22,7 @@ jobs:
# that flag starts the download asynchronously so we'd have a race # that flag starts the download asynchronously so we'd have a race
# condition. # condition.
TERRAFORM_VERSION: 0.12.7 TERRAFORM_VERSION: 0.12.7
GOFLAGS: "-mod=vendor"
steps: steps:
- checkout - checkout
- run: make build-service - run: make build-service
@@ -53,9 +54,10 @@ jobs:
# Build and push 'latest' Docker tag. # Build and push 'latest' Docker tag.
docker_master: docker_master:
working_directory: /go/src/github.com/runatlantis/atlantis
docker: docker:
- image: circleci/golang:1.12 - image: circleci/golang:1.12
environment:
GOFLAGS: "-mod=vendor"
steps: steps:
- checkout - checkout
- run: make build-service - run: make build-service
@@ -75,9 +77,10 @@ jobs:
fi fi
# Build and push Docker tag. # Build and push Docker tag.
docker_tag: docker_tag:
working_directory: /go/src/github.com/runatlantis/atlantis
docker: docker:
- image: circleci/golang:1.12 - image: circleci/golang:1.12
environment:
GOFLAGS: "-mod=vendor"
steps: steps:
- checkout - checkout
- run: make build-service - run: make build-service

1
Makefile
View File

@@ -64,7 +64,6 @@ check-lint: ## Run linter in CI/CD. If running locally use 'lint'
./bin/golangci-lint run ./bin/golangci-lint run
check-fmt: ## Fail if not formatted check-fmt: ## Fail if not formatted
go get golang.org/x/tools/cmd/goimports
if [[ $$(goimports -l $$(find . -type f -name '*.go' ! -path "./vendor/*" ! -path "./server/static/bindata_assetfs.go" ! -path "**/mocks/*")) ]]; then exit 1; fi if [[ $$(goimports -l $$(find . -type f -name '*.go' ! -path "./vendor/*" ! -path "./server/static/bindata_assetfs.go" ! -path "**/mocks/*")) ]]; then exit 1; fi
end-to-end-deps: ## Install e2e dependencies end-to-end-deps: ## Install e2e dependencies

1
testing/Dockerfile
View File

@@ -11,3 +11,4 @@ RUN curl -LOks https://releases.hashicorp.com/terraform/${TERRAFORM_VERSION}/ter
sudo unzip terraform_${TERRAFORM_VERSION}_linux_amd64.zip -d /usr/local/bin/tf/versions/${TERRAFORM_VERSION} && \ sudo unzip terraform_${TERRAFORM_VERSION}_linux_amd64.zip -d /usr/local/bin/tf/versions/${TERRAFORM_VERSION} && \
sudo ln -s /usr/local/bin/tf/versions/${TERRAFORM_VERSION}/terraform /usr/local/bin/terraform && \ sudo ln -s /usr/local/bin/tf/versions/${TERRAFORM_VERSION}/terraform /usr/local/bin/terraform && \
rm terraform_${TERRAFORM_VERSION}_linux_amd64.zip rm terraform_${TERRAFORM_VERSION}_linux_amd64.zip
RUN go get golang.org/x/tools/cmd/goimports