Merge pull request #86 from moeryomenko/move-on-modules

move on go modules
hypnoglow · Nov 3, 2019 · 87914b1 · 87914b1
2 parents 4e2299a + 26d4d9f
commit 87914b1
Show file tree

Hide file tree

Showing 7 changed files with 125 additions and 414 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -6,22 +6,23 @@ version: 2
 jobs:
   dep:
     docker:
-      - image: circleci/golang:1.9
+      - image: circleci/golang:1.12
+        environment:
+          GO111MODULE: "on"
     working_directory: /go/src/github.com/hypnoglow/helm-s3
     steps:
       - checkout
-      - run:
-          command: |
-            curl -sSL https://github.com/golang/dep/releases/download/v0.4.1/dep-linux-amd64 -o /go/bin/dep
-            chmod +x /go/bin/dep
-      - run: dep ensure -v -vendor-only
+      - run: make deps
       - persist_to_workspace:
           root: /go/src/github.com/hypnoglow
           paths:
             - helm-s3
   test-unit:
     docker:
-      - image: circleci/golang:1.10
+      - image: circleci/golang:1.12
+        environment:
+          GO111MODULE: "on"
+          GOFLAGS: "-mod=vendor"
     working_directory: /go/src/github.com/hypnoglow/helm-s3
     steps:
       - attach_workspace:
@@ -30,14 +31,16 @@ jobs:
       - run: bash <(curl -s https://codecov.io/bash)
   test-integration-and-e2e:
     docker:
-      - image: circleci/golang:1.9
+      - image: circleci/golang:1.12
         environment:
           AWS_ACCESS_KEY_ID: EXAMPLEKEY123
           AWS_SECRET_ACCESS_KEY: EXAMPLESECRET123456
           AWS_DEFAULT_REGION: us-east-1
           AWS_ENDPOINT: helm-s3-minio:9000
           AWS_DISABLE_SSL: true
           HELM_VERSION: v2.6.2
+          GO111MODULE: "on"
+          GOFLAGS: "-mod=vendor"
       - image: minio/minio:latest
         name: helm-s3-minio
         environment:
@@ -103,7 +106,10 @@ jobs:
             helm plugin install https://github.com/hypnoglow/helm-s3.git --version ${version}
   release:
     docker:
-      - image: circleci/golang:1.9
+      - image: circleci/golang:1.12
+        environment:
+          GO111MODULE: "on"
+          GOFLAGS: "-mod=vendor"
     working_directory: /go/src/github.com/hypnoglow/helm-s3
     steps:
       - attach_workspace:

diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md
@@ -15,7 +15,7 @@ Next, you may want to ensure if you have all prerequisites to build
 the plugin from source:
 
     cd ~/.helm/plugins/helm-s3
-    make dep build
+    make deps build
 
 If you see no messages - build was successful. Try to run some helm commands
 that involve the plugin, or jump straight into plugin development.