Update setup-go to obtain version via go-version-file (hashicorp#…

…1082) * Update setup-go to obtain version via go-version-file * Align GOPROXY usage Remove redundant entry from ci, add missing env to benchmarks
gamunu · Oct 6, 2022 · 81507c5 · 81507c5
1 parent a955302
commit 81507c5
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 47 deletions.
diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml
@@ -5,6 +5,9 @@ on:
     - cron:  '0 3 * * *'
   workflow_dispatch:
 
+env:
+  GOPROXY: https://proxy.golang.org/
+
 jobs:
   benchmarks:
     runs-on: ubuntu-latest
@@ -16,20 +19,11 @@ jobs:
       -
         name: Unshallow
         run: git fetch --prune --unshallow
-      -
-        name: Read go version
-        id: go-version
-        shell: bash
-        run: |
-          content=`cat ./.go-version`
-          echo "::set-output name=content::$content"
       -
         name: Set up Go
         uses: actions/setup-go@v3
         with:
-          # TODO: Replace with go-version-from-file when it is supported
-          # https://github.com/actions/setup-go/pull/62
-          go-version: ${{ steps.go-version.outputs.content }}
+          go-version-file: ".go-version"
       -
         name: Go mod download
         run: go mod download -x

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -22,21 +22,11 @@ jobs:
       -
         name: Unshallow
         run: git fetch --prune --unshallow
-      -
-        name: Read go version
-        id: go-version
-        run: |
-          content=`cat ./.go-version`
-          echo "::set-output name=content::$content"
       -
         name: Set up Go
         uses: actions/setup-go@v3
-        env:
-          GOPROXY: https://proxy.golang.org/
         with:
-          # TODO: Replace with go-version-from-file when it is supported
-          # https://github.com/actions/setup-go/pull/62
-          go-version: ${{ steps.go-version.outputs.content }}
+          go-version-file: ".go-version"
       -
         name: Generate provider schemas
         run: |
@@ -66,27 +56,11 @@ jobs:
       -
         name: Unshallow
         run: git fetch --prune --unshallow
-      -
-        name: Read go version (Unix)
-        if: ${{ runner.os != 'Windows' }}
-        id: go-version-unix
-        run: |
-          content=`cat ./.go-version`
-          echo "::set-output name=content::$content"
-      -
-        name: Read go version (Windows)
-        if: ${{ runner.os == 'Windows' }}
-        id: go-version-win
-        run: |
-          $content = Get-Content .\.go-version -Raw
-          echo "::set-output name=content::$content"
       -
         name: Set up Go
         uses: actions/setup-go@v3
         with:
-          # TODO: Replace with go-version-from-file when it is supported
-          # https://github.com/actions/setup-go/pull/62
-          go-version: ${{ steps.go-version-unix.outputs.content || steps.go-version-win.outputs.content }}
+          go-version-file: ".go-version"
       -
         name: Go mod download
         run: go mod download -x

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -23,19 +23,11 @@ jobs:
       -
         name: Unshallow
         run: git fetch --prune --unshallow
-      -
-        name: Read go version
-        id: go-version
-        run: |
-          content=`cat ./.go-version`
-          echo "::set-output name=content::$content"
       -
         name: Set up Go
         uses: actions/setup-go@v3
         with:
-          # TODO: Replace with go-version-from-file when it is supported
-          # https://github.com/actions/setup-go/pull/62
-          go-version: ${{ steps.go-version.outputs.content }}
+          go-version-file: ".go-version"
       -
         name: Generate provider schemas
         run: |