Merge pull request #80 from vshn/bump-setup-go

Update setup-go action & improve usage
vshn · Aug 10, 2023 · be80290 · be80290
2 parents 48e3ece + ee2d167
commit be80290
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 48 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -12,19 +12,9 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - name: Determine Go version from go.mod
-        run: echo "GO_VERSION=$(go mod edit -json | jq -r .Go)" >> $GITHUB_ENV
-
-      - uses: actions/setup-go@v3
-        with:
-          go-version: ${{ env.GO_VERSION }}
-
-      - uses: actions/cache@v3
+      - uses: actions/setup-go@v4
         with:
-          path: ~/go/pkg/mod
-          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
-          restore-keys: |
-            ${{ runner.os }}-go-
+          go-version-file: go.mod
 
       - name: Run build
         run: make build
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -15,6 +15,7 @@ jobs:
     - uses: actions/checkout@v3
       with:
         fetch-depth: 0
+
     - name: Configure Git
       run: |
         git config user.name "Antora via GitHub Actions"
@@ -26,34 +27,40 @@ jobs:
       with:
         input_string: ${{ github.ref }}
         version_extractor_regex: '\/v(.*)$'
+
     - name: Set variables
       run: |
         echo "MINOR_VERSION=${{ steps.semver.outputs.major }}.${{ steps.semver.outputs.minor }}" >> $GITHUB_ENV
         echo "BRANCH_NAME=docs/v${{ steps.semver.outputs.major }}.${{ steps.semver.outputs.minor }}" >> $GITHUB_ENV
+
     - name: Set branch name for Prerelease
       if: ${{ steps.semver.outputs.prerelease != '' }}
       run: echo "BRANCH_NAME=${{ env.BRANCH_NAME }}-rc" >> $GITHUB_ENV
 
     - name: Checkout remote branch if exists
       run: git checkout ${{ env.BRANCH_NAME }}
       continue-on-error: true
+
     - name: Rebase if possible
       run: git rebase ${GITHUB_REF##*/} ${{ env.BRANCH_NAME }}
       continue-on-error: true
+
     - name: Create new branch if not existing
       run: git switch --create ${{ env.BRANCH_NAME }}
       continue-on-error: true
 
     - name: Patch Antora file for Release
       run: yq eval 'del(.prerelease) | del (.display_version) | .version = "${{ env.MINOR_VERSION }}"' -i docs/antora.yml
       if: ${{ steps.semver.outputs.prerelease == '' }}
+
     - name: Patch Antora file for Prerelease
       run: yq eval 'del (.display_version) | .version = "${{ env.MINOR_VERSION }}", .prerelease = "-${{ steps.semver.outputs.prerelease }}"' -i docs/antora.yml
       if: ${{ steps.semver.outputs.prerelease != '' }}
 
     - name: Commit
       run: git commit --all --message "Update version for Antora"
       continue-on-error: true
+
     - name: Push
       run: git push --atomic --force --set-upstream origin ${{ env.BRANCH_NAME }}
 

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -9,19 +9,9 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - name: Determine Go version from go.mod
-        run: echo "GO_VERSION=$(go mod edit -json | jq -r .Go)" >> $GITHUB_ENV
-
-      - uses: actions/setup-go@v3
-        with:
-          go-version: ${{ env.GO_VERSION }}
-
-      - uses: actions/cache@v3
+      - uses: actions/setup-go@v4
         with:
-          path: ~/go/pkg/mod
-          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
-          restore-keys: |
-            ${{ runner.os }}-go-
+          go-version-file: go.mod
 
       - name: Run linters
         run: make lint
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -13,26 +13,16 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Determine Go version from go.mod
-        run: echo "GO_VERSION=$(go mod edit -json | jq -r .Go)" >> $GITHUB_ENV
-
-      - uses: actions/setup-go@v3
+      - uses: actions/setup-go@v4
         with:
-          go-version: ${{ env.GO_VERSION }}
+          go-version-file: go.mod
 
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v2
 
-      - uses: actions/cache@v3
-        with:
-          path: ~/go/pkg/mod
-          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
-          restore-keys: |
-            ${{ runner.os }}-go-
-
       - name: Login to ghcr.io
         uses: docker/login-action@v2
         with:

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -12,19 +12,9 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - name: Determine Go version from go.mod
-        run: echo "GO_VERSION=$(go mod edit -json | jq -r .Go)" >> $GITHUB_ENV
-
-      - uses: actions/setup-go@v3
-        with:
-          go-version: ${{ env.GO_VERSION }}
-
-      - uses: actions/cache@v3
+      - uses: actions/setup-go@v4
         with:
-          path: ~/go/pkg/mod
-          key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
-          restore-keys: |
-            ${{ runner.os }}-go-
+          go-version-file: go.mod
 
       - name: Run tests
         run: make test