feat: support go1.22 (#4217)

* feat: support go1.22 Signed-off-by: Rui Chen <[email protected]> * setup go toolchain for golangci-lint and tests jobs Signed-off-by: Rui Chen <[email protected]> --------- Signed-off-by: Rui Chen <[email protected]>
runatlantis · Mar 5, 2024 · 02e6e44 · 02e6e44
1 parent d757296
commit 02e6e44
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 10 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -2,7 +2,7 @@ version: 2
 jobs:
   e2e:
     docker:
-    - image: cimg/go:1.21 # If you update this, update it in the Makefile too
+    - image: cimg/go:1.22 # If you update this, update it in the Makefile too
       environment:
         # This version of TF will be downloaded before Atlantis is started.
         # We do this instead of setting --default-tf-version because setting

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -40,11 +40,17 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
     - uses: actions/checkout@v4
+
+    # need to setup go toolchain explicitly
+    - uses: actions/setup-go@v5
+      with:
+        go-version-file: go.mod
+
     - name: golangci-lint
       uses: reviewdog/action-golangci-lint@v2
       with:
         tool_name: golangci-lint
-  
+
   skip-lint:
     needs: [changes]
     if: needs.changes.outputs.should-run-linting == 'false'

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -11,13 +11,11 @@ jobs:
   goreleaser:
     runs-on: ubuntu-22.04
     steps:
-    - name: Checkout
-      uses: actions/checkout@v4
+    - uses: actions/checkout@v4
       with:
         submodules: true
 
-    - name: Set up Go
-      uses: actions/setup-go@v5
+    - uses: actions/setup-go@v5
       with:
         go-version-file: go.mod
 

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -43,6 +43,12 @@ jobs:
     container: ghcr.io/runatlantis/testing-env:latest
     steps:
       - uses: actions/checkout@v4
+
+      # need to setup go toolchain explicitly
+      - uses: actions/setup-go@v5
+        with:
+          go-version-file: go.mod
+
       - run: make test-all
       - run: make check-fmt
       ###########################################################

diff --git a/Dockerfile b/Dockerfile
@@ -8,7 +8,7 @@ ARG DEFAULT_CONFTEST_VERSION=0.46.0
 
 # Stage 1: build artifact and download deps
 
-FROM golang:1.21.6-alpine AS builder
+FROM golang:1.22.0-alpine AS builder
 
 ARG ATLANTIS_VERSION=dev
 ENV ATLANTIS_VERSION=${ATLANTIS_VERSION}

diff --git a/e2e/go.mod b/e2e/go.mod
@@ -1,6 +1,6 @@
 module github.com/runatlantis/atlantis/e2e
 
-go 1.21
+go 1.22
 
 require (
 	github.com/google/go-github/v57 v57.0.0

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/runatlantis/atlantis
 
-go 1.21
+go 1.22
 
 require (
 	github.com/Masterminds/sprig/v3 v3.2.3

diff --git a/testing/Dockerfile b/testing/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.21.6
+FROM golang:1.22.0
 
 RUN apt-get update && apt-get --no-install-recommends -y install unzip \
     && apt-get clean \