ci: bump go (#2671)

* ci: bump go
NetApp · Feb 15, 2024 · 1e4178d · 1e4178d
1 parent 711e158
commit 1e4178d
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 15 deletions.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -12,7 +12,7 @@
 name: "CodeQL"
 
 env:
-  GO_VERSION: "1.21.7"
+  GO_VERSION: "1.22.0"
 
 on:
   push:

diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -1,7 +1,7 @@
 name: Build, Test, Lint License
 
 env:
-  GO_VERSION: "1.21.7"
+  GO_VERSION: "1.22.0"
 
 on:
   push:
@@ -55,9 +55,7 @@ jobs:
           go-version: ${{ env.GO_VERSION }}
 
       - name: Install wwhrd
-        env:
-          GO111MODULE: 'off'
-        run: go get -u github.com/frapposelli/wwhrd
+        run: go install github.com/frapposelli/wwhrd@latest
       - name: go mod vendor
         env:
           GO111MODULE: 'on'

diff --git a/.github/workflows/golangci-lint.yml b/.github/workflows/golangci-lint.yml
@@ -19,7 +19,7 @@ jobs:
     steps:
       - uses: actions/setup-go@v5
         with:
-          go-version: '1.21.7'
+          go-version: '1.22.0'
       - uses: actions/checkout@v4
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v4

diff --git a/container/onePollerPerContainer/Dockerfile b/container/onePollerPerContainer/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.21.7 as builder
+FROM golang:1.22.0 as builder
 
 SHELL ["/bin/bash", "-c"]
 

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/netapp/harvest/v2
 
-go 1.21
+go 1.22
 
 require (
 	dario.cat/mergo v1.0.0

diff --git a/integration/Jenkinsfile b/integration/Jenkinsfile
@@ -18,7 +18,7 @@ pipeline {
     environment {
         BUILD_ID="dontKillMe"
         JENKINS_NODE_COOKIE="dontKillMe"
-        GO_VERSION = "1.21.7"
+        GO_VERSION = "1.22.0"
     }
 
     stages {

diff --git a/integration/go.mod b/integration/go.mod
@@ -1,15 +1,17 @@
 module github.com/Netapp/harvest-automation
 
-go 1.21
+go 1.22
+
+toolchain go1.22.0
 
 replace github.com/netapp/harvest/v2 => ../
 
 require (
 	github.com/carlmjohnson/requests v0.23.5
 	github.com/hashicorp/go-version v1.6.0
-	github.com/netapp/harvest/v2 v2.0.0-20240208073132-cf13d5bd569d
+	github.com/netapp/harvest/v2 v2.0.0-20240215072426-503b4600075d
 	github.com/rs/zerolog v1.32.0
-	github.com/tidwall/gjson v1.17.0
+	github.com/tidwall/gjson v1.17.1
 	golang.org/x/text v0.14.0
 )
 

diff --git a/integration/go.sum b/integration/go.sum
@@ -84,8 +84,8 @@ github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO
 github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
 github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
 github.com/tidwall/gjson v1.14.2/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
-github.com/tidwall/gjson v1.17.0 h1:/Jocvlh98kcTfpN2+JzGQWQcqrPQwDrVEMApx/M5ZwM=
-github.com/tidwall/gjson v1.17.0/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
+github.com/tidwall/gjson v1.17.1 h1:wlYEnwqAHgzmhNUFfw7Xalt2JzQvsMx2Se4PcoFCT/U=
+github.com/tidwall/gjson v1.17.1/go.mod h1:/wbyibRr2FHMks5tjHJ5F8dMZh3AcwJEMf5vlfC0lxk=
 github.com/tidwall/match v1.1.1 h1:+Ho715JplO36QYgwN9PGYNhgZvoUSc9X2c80KVTi+GA=
 github.com/tidwall/match v1.1.1/go.mod h1:eRSPERbgtNPcGhD8UCthc6PmLEQXEWd3PRB5JTxsfmM=
 github.com/tidwall/pretty v1.2.0/go.mod h1:ITEVvHYasfjBbM0u2Pg8T2nJnzm8xPwvNhhsoaGGjNU=

diff --git a/jenkins/artifacts/jenkinsfile b/jenkins/artifacts/jenkinsfile
@@ -37,7 +37,7 @@ pipeline {
         jfrogImagePrefix = "netappdownloads.jfrog.io/oss-docker-harvest-production/harvest"
         jfrogRepo = "netappdownloads.jfrog.io"
         COMMIT_ID = sh(returnStdout: true, script: 'git rev-parse HEAD')
-        GO_VERSION = "1.21.7"
+        GO_VERSION = "1.22.0"
     }
 
     stages {
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,7 +12,7 @@ @@
     name: "CodeQL"
     env:
-      GO_VERSION: "1.21.7"
+      GO_VERSION: "1.22.0"
     on:
       push:
@@ Expand Down @@