Skip to content
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

Jump to bottom

Replace dep with Go modules #1584

Merged
merged 5 commits into from
Aug 14, 2020
Merged

Replace dep with Go modules #1584

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
83fcc23
Replace dep with Go modules
Aug 14, 2020
9022b26
Replace dep in CircleCI
Aug 11, 2020
22411a9
Remove some unneeded GOPATH/GO111MODULE env vars from CircleCI
Aug 12, 2020
77b57f7
Add CircleCI check for vendored modules being up to date
Aug 12, 2020
1e23d03
Use git for dependency check in CircleCI
Aug 12, 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
18 changes: 3 additions & 15 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,15 @@ jobs:
deps:
docker:
- image: circleci/golang:1.14
environment:
GOPATH: /home/circleci/.go_workspace
working_directory: /home/circleci/.go_workspace/src/github.com/loadimpact/k6
steps:
- checkout
- run:
name: Check dependencies
command: |
go version
export PATH="$GOPATH/bin:$PATH"
mkdir -p "$GOPATH/bin"
curl --fail https://raw.githubusercontent.com/golang/dep/master/install.sh | sh
dep version
dep status
case $(dep ensure 2>&1 | head -n 1) in Warning*) false ;; esac
dep check

test -z "$(go mod vendor && git status --porcelain)"
go mod verify
na-- marked this conversation as resolved.
Show resolved Hide resolved

lint:
docker:
imiric marked this conversation as resolved.
Show resolved Hide resolved
Expand All @@ -42,7 +34,7 @@ jobs:
command: |
export PATH="$GOPATH/bin:$PATH"
command -v golangci-lint && exit
GO111MODULE=on go get github.com/golangci/golangci-lint/cmd/golangci-lint@$GOLANGCI_VERSION
go get github.com/golangci/golangci-lint/cmd/golangci-lint@$GOLANGCI_VERSION
- save_cache:
name: Save golangci-lint cache
key: golangci-lint-{{ arch }}-{{ checksum "/tmp/.golangci.version" }}-{{ .Environment.CACHE_VERSION }}
Expand Down Expand Up @@ -87,8 +79,6 @@ jobs:
test-prev-golang:
docker:
- image: circleci/golang:1.13
environment:
GOPATH: /home/circleci/.go_workspace
working_directory: /home/circleci/.go_workspace/src/github.com/loadimpact/k6
steps:
- checkout
Expand All @@ -100,8 +90,6 @@ jobs:
build-docker-images:
docker:
- image: circleci/golang:1.14
environment:
GOPATH: /home/circleci/.go_workspace
working_directory: /home/circleci/.go_workspace/src/github.com/loadimpact/k6
steps:
- checkout
Expand Down
13 changes: 13 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,16 @@ test.debug
.vagrant

*.DS_Store

/vendor/**/.editorconfig
/vendor/**/*.jpg
/vendor/**/*.json
/vendor/**/.*.json
/vendor/**/Makefile
/vendor/**/*.png
/vendor/**/*.tmpl
/vendor/**/*.txt
!/vendor/modules.txt
/vendor/**/*.y*ml
/vendor/**/.*.y*ml
/vendor/github.com/dlclark/regexp2/testoutput1
Loading