Update Helm dependency to v3.4.0

Signed-off-by: Reinhard Nägele <unguiculus@gmail.com>
helm · Oct 29, 2020 · 44a7776 · 44a7776
1 parent 7b6f9ac
commit 44a7776
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 9 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -16,7 +16,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v2
         with:
-          go-version: "1.14.5"
+          go-version: "1.15.3"
 
       - name: Cache
         uses: actions/cache@v2

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -19,7 +19,7 @@ jobs:
       - name: Setup Go
         uses: actions/setup-go@v2
         with:
-          go-version: "1.14.5"
+          go-version: "1.15.3"
 
       - name: Cache
         uses: actions/cache@v2
@@ -35,9 +35,6 @@ jobs:
       - name: Check License Headers
         run: mage -v checkLicenseHeaders
 
-      - name: Lint
-        run: mage -v lint
-
       - name: Test
         run: mage -v test
 

diff --git a/go.mod b/go.mod
@@ -28,7 +28,7 @@ require (
 	golang.org/x/tools v0.0.0-20200812195022-5ae4c3c160a0
 	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
 	gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect
-	helm.sh/helm/v3 v3.4.0-rc.1
+	helm.sh/helm/v3 v3.4.0
 	honnef.co/go/tools v0.0.1-2020.1.5 // indirect
 	rsc.io/letsencrypt v0.0.3 // indirect; indirect)
 )

diff --git a/go.sum b/go.sum
@@ -1282,8 +1282,8 @@ gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C
 gotest.tools v2.2.0+incompatible h1:VsBPFP1AI068pPrMxtb/S8Zkgf9xEmTLJjfM+P5UIEo=
 gotest.tools v2.2.0+incompatible/go.mod h1:DsYFclhRJ6vuDpmuTbkuFWG+y2sxOXAzmJt81HFBacw=
 gotest.tools/v3 v3.0.2/go.mod h1:3SzNCllyD9/Y+b5r9JIKQ474KzkZyqLqEfYqMsX94Bk=
-helm.sh/helm/v3 v3.4.0-rc.1 h1:xHj/iJqDV3M3/WoS4HbNmAJCfb39wTstHhB+XOfva04=
-helm.sh/helm/v3 v3.4.0-rc.1/go.mod h1:jbfz/BoYmpJ3njhHBdH7F3kR8CNUGeRueliFtOhQK+M=
+helm.sh/helm/v3 v3.4.0 h1:rsut6hqQfjD3G/ic1XPh3KyasfOHZuDUhtyAJjuquew=
+helm.sh/helm/v3 v3.4.0/go.mod h1:jbfz/BoYmpJ3njhHBdH7F3kR8CNUGeRueliFtOhQK+M=
 honnef.co/go/tools v0.0.0-20180728063816-88497007e858/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=

diff --git a/magefile.go b/magefile.go
@@ -41,10 +41,14 @@ func Lint() error {
 	if err := sh.RunV("goimports", "-w", "-l", "."); err != nil {
 		return err
 	}
+	if err := sh.RunV("git", "diff", "--exit-code"); err != nil {
+		return err
+	}
+	// Run after git diff check because it produces random changes different from when run locally
 	if err := sh.RunV("go", "mod", "tidy"); err != nil {
 		return err
 	}
-	return sh.RunV("git", "diff", "--exit-code")
+	return nil
 }
 
 func CheckLicenseHeaders() error {