mirrors/vault
1
0
Fork 0
mirror of https://github.com/hashicorp/vault.git synced 2025-11-29 14:41:09 +01:00
Code Issues Projects Releases Wiki Activity

Use a more minimal bootstrap target when running in CI: just what we need to satisfy our job needs. Also remove govendor which we no longer use. (#8808)

Browse Source
This commit is contained in:
ncabatoff 2020-04-22 15:05:49 -04:00 committed by GitHub
parent 8799d965d7
commit 65ffb86bea
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.circleci/config.yml generated
View File

@ -86,7 +86,7 @@ jobs:
mkdir ./pkg mkdir ./pkg
# Build dev binary # Build dev binary
make bootstrap dev make ci-bootstrap dev
name: Build dev binary name: Build dev binary
- persist_to_workspace: - persist_to_workspace:
paths: paths:
@ -517,7 +517,7 @@ workflows:
# mkdir ./pkg # mkdir ./pkg
# #
# # Build dev binary # # Build dev binary
# make bootstrap dev # make ci-bootstrap dev
# name: Build dev binary # name: Build dev binary
# - persist_to_workspace: # - persist_to_workspace:
# paths: # paths:

2
.circleci/config/jobs/build-go-dev.yml
View File

@ -12,7 +12,7 @@ steps:
mkdir ./pkg mkdir ./pkg
# Build dev binary # Build dev binary
make bootstrap dev make ci-bootstrap dev
- persist_to_workspace: - persist_to_workspace:
root: . root: .
paths: paths:

21
Makefile
View File

@ -9,12 +9,12 @@ TEST_TIMEOUT?=45m
EXTENDED_TEST_TIMEOUT=60m EXTENDED_TEST_TIMEOUT=60m
INTEG_TEST_TIMEOUT=120m INTEG_TEST_TIMEOUT=120m
VETARGS?=-asmdecl -atomic -bool -buildtags -copylocks -methods -nilfunc -printf -rangeloops -shift -structtags -unsafeptr VETARGS?=-asmdecl -atomic -bool -buildtags -copylocks -methods -nilfunc -printf -rangeloops -shift -structtags -unsafeptr
EXTERNAL_TOOLS=\ EXTERNAL_TOOLS_CI=\
golang.org/x/tools/cmd/goimports \
github.com/elazarl/go-bindata-assetfs/... \ github.com/elazarl/go-bindata-assetfs/... \
github.com/hashicorp/go-bindata/... \ github.com/hashicorp/go-bindata/... \
github.com/mitchellh/gox \ github.com/mitchellh/gox
github.com/kardianos/govendor \ EXTERNAL_TOOLS=\
golang.org/x/tools/cmd/goimports \
github.com/client9/misspell/cmd/misspell \ github.com/client9/misspell/cmd/misspell \
github.com/golangci/golangci-lint/cmd/golangci-lint github.com/golangci/golangci-lint/cmd/golangci-lint
GOFMT_FILES?=$$(find . -name '*.go' | grep -v pb.go | grep -v vendor) GOFMT_FILES?=$$(find . -name '*.go' | grep -v pb.go | grep -v vendor)
@ -126,8 +126,15 @@ ci-config:
ci-verify: ci-verify:
@$(MAKE) -C .circleci ci-verify @$(MAKE) -C .circleci ci-verify
# bootstrap the build by downloading additional tools # bootstrap the build by downloading additional tools needed to build
bootstrap: ci-bootstrap:
@for tool in $(EXTERNAL_TOOLS_CI) ; do \
echo "Installing/Updating $$tool" ; \
GO111MODULE=off $(GO_CMD) get -u $$tool; \
done
# bootstrap the build by downloading additional tools that may be used by devs
bootstrap: ci-bootstrap
@for tool in $(EXTERNAL_TOOLS) ; do \ @for tool in $(EXTERNAL_TOOLS) ; do \
echo "Installing/Updating $$tool" ; \ echo "Installing/Updating $$tool" ; \
GO111MODULE=off $(GO_CMD) get -u $$tool; \ GO111MODULE=off $(GO_CMD) get -u $$tool; \
@ -274,6 +281,6 @@ publish-commit:
@[ -n "$(PUBLISH_VERSION)" ] || { echo "You must set PUBLISH_VERSION to the version in semver-like format."; exit 1; } @[ -n "$(PUBLISH_VERSION)" ] || { echo "You must set PUBLISH_VERSION to the version in semver-like format."; exit 1; }
set -x; $(GPG_KEY_VARS) && git commit --allow-empty --gpg-sign=$$GIT_GPG_KEY_ID -m 'release: publish v$(PUBLISH_VERSION)' set -x; $(GPG_KEY_VARS) && git commit --allow-empty --gpg-sign=$$GIT_GPG_KEY_ID -m 'release: publish v$(PUBLISH_VERSION)'
.PHONY: bin default prep test vet bootstrap fmt fmtcheck mysql-database-plugin mysql-legacy-database-plugin cassandra-database-plugin influxdb-database-plugin postgresql-database-plugin mssql-database-plugin hana-database-plugin mongodb-database-plugin static-assets ember-dist ember-dist-dev static-dist static-dist-dev assetcheck check-vault-in-path check-browserstack-creds test-ui-browserstack stage-commit publish-commit .PHONY: bin default prep test vet ci-bootstrap bootstrap fmt fmtcheck mysql-database-plugin mysql-legacy-database-plugin cassandra-database-plugin influxdb-database-plugin postgresql-database-plugin mssql-database-plugin hana-database-plugin mongodb-database-plugin static-assets ember-dist ember-dist-dev static-dist static-dist-dev assetcheck check-vault-in-path check-browserstack-creds test-ui-browserstack stage-commit publish-commit
.NOTPARALLEL: ember-dist ember-dist-dev static-assets .NOTPARALLEL: ember-dist ember-dist-dev static-assets