Skip to content

Commit

Permalink
Use a more minimal bootstrap target when running in CI: just what we …
Browse files Browse the repository at this point in the history
…need to satisfy our job needs. Also remove govendor which we no longer use. (#8808) (#8828)
  • Loading branch information
ncabatoff committed Apr 24, 2020
1 parent 72f38bb commit c561656
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 10 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .circleci/config/jobs/build-go-dev.yml
Expand Up @@ -12,7 +12,7 @@ steps:
mkdir ./pkg
# Build dev binary
make bootstrap dev
make ci-bootstrap dev
- persist_to_workspace:
root: .
paths:
Expand Down
21 changes: 14 additions & 7 deletions Makefile
Expand Up @@ -9,12 +9,12 @@ TEST_TIMEOUT?=45m
EXTENDED_TEST_TIMEOUT=60m
INTEG_TEST_TIMEOUT=120m
VETARGS?=-asmdecl -atomic -bool -buildtags -copylocks -methods -nilfunc -printf -rangeloops -shift -structtags -unsafeptr
EXTERNAL_TOOLS=\
golang.org/x/tools/cmd/goimports \
EXTERNAL_TOOLS_CI=\
github.com/elazarl/go-bindata-assetfs/... \
github.com/hashicorp/go-bindata/... \
github.com/mitchellh/gox \
github.com/kardianos/govendor \
github.com/mitchellh/gox
EXTERNAL_TOOLS=\
golang.org/x/tools/cmd/goimports \
github.com/client9/misspell/cmd/misspell \
github.com/golangci/golangci-lint/cmd/golangci-lint
GOFMT_FILES?=$$(find . -name '*.go' | grep -v pb.go | grep -v vendor)
Expand Down Expand Up @@ -126,8 +126,15 @@ ci-config:
ci-verify:
@$(MAKE) -C .circleci ci-verify

# bootstrap the build by downloading additional tools
bootstrap:
# bootstrap the build by downloading additional tools needed to build
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 \
echo "Installing/Updating $$tool" ; \
GO111MODULE=off $(GO_CMD) get -u $$tool; \
Expand Down Expand Up @@ -274,6 +281,6 @@ publish-commit:
@[ -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)'

.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

0 comments on commit c561656

Please sign in to comment.