Skip to content

CI - go mod test #9087

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 10 commits into
base: main
Choose a base branch
from
Open

CI - go mod test #9087

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
ad497a7
CI - go mod test
sarahethompson May 26, 2020
0c87d60
Merge branch 'master' into ci-go-mod-test
samsalisbury May 28, 2020
220362c
Merge branch 'master' into ci-go-mod-test
sarahethompson May 29, 2020
ed9098e
Merge branch 'master' into ci-go-mod-test
sarahethompson Jun 10, 2020
a64cf61
Merge branch 'master' into ci-go-mod-test
sarahethompson Jun 15, 2020
6fffb88
Merge branch 'master' into ci-go-mod-test
sarahethompson Jun 16, 2020
ee6b401
Merge branch 'master' into ci-go-mod-test
sarahethompson Jun 17, 2020
57a0ae1
Merge branch 'master' into ci-go-mod-test
sarahethompson Jun 17, 2020
d2f5c33
Merge branch 'master' into ci-go-mod-test
sarahethompson Jun 18, 2020
896d602
Merge branch 'master' into ci-go-mod-test
sarahethompson Jun 22, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
CI - go mod test
  • Loading branch information
@sarahethompson
sarahethompson committed May 27, 2020
commit ad497a75899f654cb1c34bf2009bb8ed0c157676
12 changes: 6 additions & 6 deletions .circleci/config.yml
View file
Open in desktop

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/@config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ executors:
machine: true
shell: /usr/bin/env bash -euo pipefail -c
environment:
GO111MODULE: "off"
GOFLAGS: -mod=vendor
CIRCLECI_CLI_VERSION: 0.1.5546 # Pin CircleCI CLI to patch version (ex: 1.2.3)
GO_VERSION: 1.13.8 # Pin Go to patch version (ex: 1.2.3)
GOTESTSUM_VERSION: 0.3.3 # Pin gotestsum to patch version (ex: 1.2.3)
Expand Down
2 changes: 1 addition & 1 deletion .circleci/config/jobs/build-go-dev.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ steps:
mkdir ./pkg

# Build dev binary
make ci-bootstrap dev
make bootstrap dev
- persist_to_workspace:
root: .
paths:
Expand Down
16 changes: 1 addition & 15 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,6 @@ 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_CI=\
github.com/elazarl/go-bindata-assetfs/... \
github.com/hashicorp/go-bindata/... \
github.com/mitchellh/gox \
golang.org/x/tools/cmd/goimports
EXTERNAL_TOOLS=\
github.com/client9/misspell/cmd/misspell
GOFMT_FILES?=$$(find . -name '*.go' | grep -v pb.go | grep -v vendor)


Expand Down Expand Up @@ -125,15 +118,8 @@ ci-config:
ci-verify:
@$(MAKE) -C .circleci ci-verify

# 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
bootstrap:
go generate -tags tools tools/tools.go

# Note: if you have plugins in GOPATH you can update all of them via something like:
Expand Down
4 changes: 2 additions & 2 deletions tools/tools.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ import _ "golang.org/x/tools/cmd/goimports"
//go:generate go install github.com/mitchellh/gox
import _ "github.com/mitchellh/gox"

//go:generate go install github.com/hashicorp/go-bindata
//go:generate go install github.com/hashicorp/go-bindata/...
import _ "github.com/hashicorp/go-bindata"

//go:generate go install github.com/elazarl/go-bindata-assetfs
//go:generate go install github.com/elazarl/go-bindata-assetfs/...
import _ "github.com/elazarl/go-bindata-assetfs"

//go:generate go install github.com/client9/misspell/cmd/misspell
Expand Down