Update Go to v1.19 (#99)

To stay aligned with antrea-io/antrea Most notables changes: * we remove all uses of the io/ioutil package, which has been deprecated * gofmt now reformats doc comments (e.g., lists inside comment blocks), which is why some comments have been reformatted automatically * we now use the version of Go from the root go.mod file when setting up Go in Github workflows. This will reduce the number of changes we have to do in the future when updating Go. Signed-off-by: Antonin Bas <abas@vmware.com>
antrea-io · Aug 25, 2022 · 79f07a5 · 79f07a5
1 parent 4770ff0
commit 79f07a5
Show file tree

Hide file tree

Showing 25 changed files with 159 additions and 413 deletions.
diff --git a/.github/workflows/clair.yml b/.github/workflows/clair.yml
@@ -11,9 +11,9 @@ jobs:
     runs-on: [ubuntu-latest]
     steps:
     - uses: actions/checkout@v3
-    - uses: actions/setup-go@v2
+    - uses: actions/setup-go@v3
       with:
-        go-version: 1.17
+        go-version-file: 'go.mod'
     - name: Scan Theia Docker image for vulnerabilities
       run: |
         mkdir clair-reports

diff --git a/.github/workflows/go.yml b/.github/workflows/go.yml
@@ -38,12 +38,12 @@ jobs:
         os: [ubuntu-latest]
     runs-on: ${{ matrix.os }}
     steps:
-    - name: Set up Go 1.17
-      uses: actions/setup-go@v2
-      with:
-        go-version: 1.17
     - name: Check-out code
       uses: actions/checkout@v3
+    - name: Set up Go using version from go.mod
+      uses: actions/setup-go@v3
+      with:
+        go-version-file: 'go.mod'
     - uses: actions/cache@v3
       with:
         # In order:
@@ -77,12 +77,12 @@ jobs:
         platform: [ubuntu-latest, macos-latest]
     runs-on: ${{ matrix.platform }}
     steps:
-    - name: Set up Go 1.17
-      uses: actions/setup-go@v2
-      with:
-        go-version: 1.17
     - name: Check-out code
       uses: actions/checkout@v3
+    - name: Set up Go using version from go.mod
+      uses: actions/setup-go@v3
+      with:
+        go-version-file: 'go.mod'
     - uses: actions/cache@v3
       with:
         # In order:
@@ -106,12 +106,12 @@ jobs:
     name: Check tidy and manifest
     runs-on: [ubuntu-latest]
     steps:
-    - name: Set up Go 1.17
-      uses: actions/setup-go@v2
-      with:
-        go-version: 1.17
     - name: Check-out code
       uses: actions/checkout@v3
+    - name: Set up Go using version from go.mod
+      uses: actions/setup-go@v3
+      with:
+        go-version-file: 'go.mod'
     - name: Check tidy
       run: make test-tidy
     - name: Check manifest
@@ -123,12 +123,12 @@ jobs:
     name: Verify docs and spelling
     runs-on: [ubuntu-latest]
     steps:
-    - name: Set up Go 1.17
-      uses: actions/setup-go@v2
-      with:
-        go-version: 1.17
     - name: Check-out code
       uses: actions/checkout@v3
+    - name: Set up Go using version from go.mod
+      uses: actions/setup-go@v3
+      with:
+        go-version-file: 'go.mod'
     - name: Run verify scripts
       run: make verify
     - name: Checking for broken Markdown links

diff --git a/.github/workflows/golicense.yml b/.github/workflows/golicense.yml
@@ -33,11 +33,11 @@ jobs:
     if: ${{ needs.check-changes.outputs.has_changes == 'yes' || github.event_name != 'pull_request' }}
     runs-on: [ubuntu-latest]
     steps:
-    - name: Set up Go 1.17
-      uses: actions/setup-go@v2
-      with:
-        go-version: 1.17
     - uses: actions/checkout@v3
+    - name: Set up Go using version from go.mod
+      uses: actions/setup-go@v3
+      with:
+        go-version-file: 'go.mod'
     - name: Cache licensing information for dependencies
       uses: actions/cache@v3
       id: cache

diff --git a/.github/workflows/kind.yml b/.github/workflows/kind.yml
@@ -59,7 +59,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-go@v3
         with:
-          go-version: 1.17
+          go-version-file: 'go.mod'
       - name: Download Theia images from previous jobs
         uses: actions/download-artifact@v3
         with:
@@ -100,7 +100,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-go@v3
         with:
-          go-version: 1.17
+          go-version-file: 'go.mod'
       - name: Install Kind
         run: |
           curl -Lo ./kind https://github.com/kubernetes-sigs/kind/releases/download/${KIND_VERSION}/kind-$(uname)-amd64

diff --git a/.github/workflows/process_release.yml b/.github/workflows/process_release.yml
@@ -8,11 +8,11 @@ jobs:
   upload-release-assets:
     runs-on: ubuntu-latest
     steps:
-    - name: Set up Go 1.17
-      uses: actions/setup-go@v2
-      with:
-        go-version: 1.17
     - uses: actions/checkout@v3
+    - name: Set up Go using version from go.mod
+      uses: actions/setup-go@v3
+      with:
+        go-version-file: 'go.mod'
     - name: Build assets
       env:
         TAG: ${{ github.ref }}

diff --git a/.github/workflows/verify_docs.yml b/.github/workflows/verify_docs.yml
@@ -10,12 +10,12 @@ jobs:
     name: Verify docs and spelling
     runs-on: [ubuntu-latest]
     steps:
-    - name: Set up Go 1.17
-      uses: actions/setup-go@v3
-      with:
-        go-version: 1.17
     - name: Check-out code
       uses: actions/checkout@v3
+    - name: Set up Go using version from go.mod
+      uses: actions/setup-go@v3
+      with:
+        go-version-file: 'go.mod'
     - name: Run verify scripts
       run: make verify
     - name: Checking for broken Markdown links for main branch

diff --git a/.golangci.yml b/.golangci.yml
@@ -13,12 +13,13 @@ linters-settings:
     ignore-generated-header: false
     severity: warning
     confidence: 0.8
+    # errorf, var-declaration temporarily disabled because of https://github.com/golangci/golangci-lint/issues/2997
     rules:
       - name: unreachable-code
-      - name: errorf
+      # - name: errorf
       - name: range
       - name: superfluous-else
-      - name: var-declaration
+      # - name: var-declaration
 
 linters:
   disable-all: true

diff --git a/Makefile b/Makefile
@@ -54,7 +54,7 @@ DOCKER_ENV := \
 		-v $(DOCKER_CACHE)/gopath:/tmp/gopath \
 		-v $(DOCKER_CACHE)/gocache:/tmp/gocache \
 		-v $(CURDIR):/usr/src/antrea.io/theia \
-		golang:1.17
+		golang:1.19
 
 .PHONY: docker-test-unit
 docker-test-unit: $(DOCKER_CACHE)
@@ -98,7 +98,7 @@ fmt:
 
 .golangci-bin:
 	@echo "===> Installing Golangci-lint <==="
-	@curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $@ v1.41.1
+	@curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $@ v1.48.0
 
 .PHONY: golangci
 golangci: .golangci-bin

diff --git a/build/images/deps/go-version b/build/images/deps/go-version
@@ -1 +1 @@
-1.17
+1.19
diff --git a/ci/clair-scan/go.mod b/ci/clair-scan/go.mod
@@ -1,6 +1,6 @@
 module antrea.io/theia/ci/clair
 
-go 1.17
+go 1.19
 
 require (
 	github.com/aws/aws-sdk-go v1.30.23

diff --git a/ci/golicense/run.sh b/ci/golicense/run.sh
@@ -21,7 +21,7 @@ if [ "$#" -ne 2 ]; then
     exit 1
 fi
 
-IMG=antrea/lichen
+IMG=antrea/lichen:v0.1.7
 THIS_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 BINARIES_DIR="$( cd "$1" >/dev/null 2>&1 && pwd )"
 REPORTS_DIR="$( cd "$2" >/dev/null 2>&1 && pwd )"

diff --git a/ci/jenkins/test-vmc.sh b/ci/jenkins/test-vmc.sh
@@ -427,7 +427,6 @@ function run_e2e {
 
     mkdir -p ${GIT_CHECKOUT_DIR}/theia-test-logs
     go version
-    go mod tidy -compat=1.17
 
     set +e
     # HACK: see https://github.com/antrea-io/antrea/issues/2292

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module antrea.io/theia
 
-go 1.17
+go 1.19
 
 require (
 	antrea.io/antrea v1.6.0