Merge pull request #1584 from loadimpact/build/1070-go-modules

Replace dep with Go modules
grafana · Aug 14, 2020 · bc31944 · bc31944
2 parents 691ef2d + 1e23d03
commit bc31944
Show file tree

Hide file tree

Showing 226 changed files with 17,046 additions and 33,443 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -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
 
   lint:
     docker:
@@ -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 }}
@@ -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
@@ -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

diff --git a/.gitignore b/.gitignore
@@ -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