Merge pull request #413 from ava-labs/golang-1.21.12

Golang 1.21.12
ava-labs · Jul 5, 2024 · f36a227 · f36a227
2 parents 2bcc34f + 6de0f52
commit f36a227
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 39 deletions.
diff --git a/.github/workflows/abi_bindings_checker.yml b/.github/workflows/abi_bindings_checker.yml
@@ -19,15 +19,10 @@ jobs:
         with:
           submodules: recursive
 
-      - name: Set Go version
-        run: |
-          source ./scripts/versions.sh
-          echo GO_VERSION=$GO_VERSION >> $GITHUB_ENV
-
       - name: Setup Go
         uses: actions/setup-go@v5
         with:
-          go-version: ${{ env.GO_VERSION }}
+          go-version-file: 'go.mod'
 
       - name: Install Foundry
         run: ./scripts/install_foundry.sh

diff --git a/.github/workflows/gomod_checker.yml b/.github/workflows/gomod_checker.yml
@@ -18,13 +18,9 @@ jobs:
         with:
           submodules: recursive
 
-      - run: |
-          source ./scripts/versions.sh
-          echo GO_VERSION=$GO_VERSION >> $GITHUB_ENV
-
       - uses: actions/setup-go@v5
         with:
-          go-version: ${{ env.GO_VERSION }}
+          go-version-file: 'go.mod'
 
       - run: go mod tidy
       - run: git --no-pager diff -- go.mod go.sum  # This prints the diff

diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml
@@ -31,15 +31,10 @@ jobs:
       with:
         submodules: recursive
 
-    - name: Set Go version
-      run: |
-        source ./scripts/versions.sh
-        echo GO_VERSION=$GO_VERSION >> $GITHUB_ENV
-
     - name: Setup Go
       uses: actions/setup-go@v5
       with:
-        go-version: ${{ env.GO_VERSION }}
+          go-version-file: 'go.mod'
 
     - name: Run Lint
       run: ./scripts/lint.sh --go-lint

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -24,15 +24,10 @@ jobs:
         with:
           submodules: recursive
 
-      - name: Set Go version
-        run: |
-          source ./scripts/versions.sh
-          echo GO_VERSION=$GO_VERSION >> $GITHUB_ENV
-
       - name: Setup Go
         uses: actions/setup-go@v5
         with:
-          go-version: ${{ env.GO_VERSION }}
+          go-version-file: 'go.mod'
 
       - name: Install Foundry
         run: ./scripts/install_foundry.sh

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -36,15 +36,10 @@ jobs:
         with:
           submodules: recursive
 
-      - name: Set Go version
-        run: |
-          source ./scripts/versions.sh
-          echo GO_VERSION=$GO_VERSION >> $GITHUB_ENV
-
       - name: Setup Go
         uses: actions/setup-go@v5
         with:
-          go-version: ${{ env.GO_VERSION }}
+          go-version-file: 'go.mod'
 
       - name: Run Go unit tests
         run: |
@@ -60,15 +55,10 @@ jobs:
         with:
           submodules: recursive
 
-      - name: Set Go version
-        run: |
-          source ./scripts/versions.sh
-          echo GO_VERSION=$GO_VERSION >> $GITHUB_ENV
-
       - name: Setup Go
         uses: actions/setup-go@v5
         with:
-          go-version: ${{ env.GO_VERSION }}
+          go-version-file: 'go.mod'
 
       - name: Install Foundry
         run: ./scripts/install_foundry.sh

diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/ava-labs/teleporter
 
-go 1.21.11
+go 1.21.12
 
 require (
 	github.com/ava-labs/avalanchego v1.11.1

diff --git a/scripts/versions.sh b/scripts/versions.sh
@@ -28,9 +28,6 @@ extract_commit() {
 # AWM_RELAYER_VERSION is needed for the docker run setup, but is not a go module dependency.
 AWM_RELAYER_VERSION=${AWM_RELAYER_VERSION:-'v1.0.0'}
 
-# This needs to be exported to be picked up by the dockerfile.
-export GO_VERSION=${GO_VERSION:-$(getDepVersion go)}
-
 # Don't export them as they're used in the context of other calls
 AVALANCHEGO_VERSION=${AVALANCHEGO_VERSION:-$(getDepVersion github.com/ava-labs/avalanchego)}
 GINKGO_VERSION=${GINKGO_VERSION:-$(getDepVersion github.com/onsi/ginkgo/v2)}