revert: remove unrelated dependency audit updates

This reverts commit aa2cac01fd. The split-cache implementation and sequential-restore simplifications are retained.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

.gitattributes

@@ -1,2 +1,2 @@
-* text=auto
+* text=auto eol=lf
 .licenses/** -diff linguist-generated=true

.github/ISSUE_TEMPLATE/bug_report.md

@@ -7,7 +7,7 @@ assignees: ''
 
 ---
 
-<!--- Please direct any generic questions related to actions to our support community forum at https://github.community/c/code-to-cloud/github-actions/41 --->
+<!--- Please direct any generic questions related to actions to our support community forum at https://github.com/orgs/community/discussions/categories/actions --->
 <!--- Before opening up a new bug report, please make sure to check for similar existing issues -->
 
 **Description:**

.github/ISSUE_TEMPLATE/config.yml

@@ -1 +1 @@
-blank_issues_enabled: false
+blank_issues_enabled: false

.github/ISSUE_TEMPLATE/feature_request.md

@@ -5,7 +5,7 @@ title: ''
 labels: feature request, needs triage
 assignees: ''
 ---
-<!--- Please direct any generic questions related to actions to our support community forum at https://github.community/c/code-to-cloud/github-actions/41 --->
+<!--- Please direct any generic questions related to actions to our support community forum at https://github.com/orgs/community/discussions/categories/actions --->
 <!--- Before opening up a new feature request, please make sure to check for similar existing issues and pull requests -->
 
 **Description:**

.github/dependabot.yml

@@ -0,0 +1,22 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/code-security/dependabot/dependabot-version-updates/configuration-options-for-the-dependabot.yml-file
+
+version: 2
+updates:
+  # Enable version updates for npm
+  - package-ecosystem: 'npm'
+    # Look for `package.json` and `lock` files in the `root` directory
+    directory: '/'
+    # Check the npm registry for updates every day (weekdays)
+    schedule:
+      interval: 'weekly'
+
+  # Enable version updates for GitHub Actions
+  - package-ecosystem: 'github-actions'
+    # Workflow files stored in the default location of `.github/workflows`
+    # You don't need to specify `/.github/workflows` for `directory`. You can use `directory: "/"`.
+    directory: '/'
+    schedule:
+      interval: 'weekly'

.github/workflows/basic-validation.yml

@@ -0,0 +1,18 @@
+name: Basic validation
+
+on:
+  push:
+    branches:
+      - main
+    paths-ignore:
+      - '**.md'
+  pull_request:
+    paths-ignore:
+      - '**.md'
+
+jobs:
+  call-basic-validation:
+    name: Basic validation
+    uses: actions/reusable-workflows/.github/workflows/basic-validation.yml@main
+    with:
+      node-version: '24.x'

.github/workflows/check-dist.yml

@@ -1,8 +1,3 @@
-# `dist/index.js` is a special file in Actions.
-# When you reference an action with `uses:` in a workflow,
-# `index.js` is the code that will run.
-# For our project, we generate this file through a build process from other source files.
-# We need to make sure the checked-in `index.js` actually matches what we expect it to be.
 name: Check dist/
 
 on:
@@ -17,36 +12,8 @@ on:
   workflow_dispatch:
 
 jobs:
-  check-dist:
-    runs-on: ubuntu-latest
-
-    steps:
-      - uses: actions/checkout@v3
-
-      - name: Set Node.js 16.x
-        uses: actions/setup-node@v3
-        with:
-          node-version: 16.x
-          cache: npm
-
-      - name: Install dependencies
-        run: npm ci
-
-      - name: Rebuild the dist/ directory
-        run: npm run build
-
-      - name: Compare the expected and actual dist/ directories
-        run: |
-          if [ "$(git diff --ignore-space-at-eol dist/ | wc -l)" -gt "0" ]; then
-            echo "Detected uncommitted changes after build.  See status below:"
-            git diff
-            exit 1
-          fi
-        id: diff
-
-      # If index.js was different than expected, upload the expected version as an artifact
-      - uses: actions/upload-artifact@v3
-        if: ${{ failure() && steps.diff.conclusion == 'failure' }}
-        with:
-          name: dist
-          path: dist/
+  call-check-dist:
+    name: Check dist/
+    uses: actions/reusable-workflows/.github/workflows/check-dist.yml@main
+    with:
+      node-version: '24.x'

.github/workflows/codeql-analysis.yml

@@ -0,0 +1,14 @@
+name: CodeQL analysis
+
+on:
+  push:
+    branches: [main]
+  pull_request:
+    branches: [main]
+  schedule:
+    - cron: '0 3 * * 0'
+
+jobs:
+  call-codeQL-analysis:
+    name: CodeQL analysis
+    uses: actions/reusable-workflows/.github/workflows/codeql-analysis.yml@main

.github/workflows/licensed.yml

@@ -9,20 +9,6 @@ on:
       - main
 
 jobs:
-  test:
-    runs-on: ubuntu-latest
-    name: Check licenses
-    steps:
-      - uses: actions/checkout@v3
-      - name: Set Node.js 16.x
-        uses: actions/setup-node@v3
-        with:
-          node-version: 16.x
-      - run: npm ci
-      - name: Install licensed
-        run: |
-          cd $RUNNER_TEMP
-          curl -Lfs -o licensed.tar.gz https://github.com/github/licensed/releases/download/3.4.4/licensed-3.4.4-linux-x64.tar.gz
-          sudo tar -xzf licensed.tar.gz
-          sudo mv licensed /usr/local/bin/licensed
-      - run: licensed status
+  call-licensed:
+    name: Licensed
+    uses: actions/reusable-workflows/.github/workflows/licensed.yml@main

.github/workflows/microsoft-validation.yml

@@ -0,0 +1,143 @@
+name: Validate Microsoft build of Go
+
+on:
+  push:
+    branches:
+      - main
+    paths-ignore:
+      - '**.md'
+  pull_request:
+    paths-ignore:
+      - '**.md'
+
+jobs:
+  microsoft-basic:
+    name: 'Microsoft build of Go ${{ matrix.go-version }} on ${{ matrix.os }}'
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, windows-latest, macos-latest]
+        go-version: ['1.25', '1.24']
+    steps:
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+
+      - name: Setup Microsoft build of Go ${{ matrix.go-version }}
+        uses: ./
+        with:
+          go-version: ${{ matrix.go-version }}
+          go-download-base-url: 'https://aka.ms/golang/release/latest'
+          cache: false
+
+      - name: Verify Go installation
+        run: go version
+
+      - name: Verify Go env
+        run: go env
+
+      - name: Verify Go is functional
+        shell: bash
+        run: |
+          # Create a simple Go program and run it
+          mkdir -p /tmp/test-go && cd /tmp/test-go
+          cat > main.go << 'EOF'
+          package main
+          import "fmt"
+          func main() {
+            fmt.Println("Hello from Microsoft build of Go!")
+          }
+          EOF
+          go run main.go
+
+  microsoft-env-var:
+    name: 'Microsoft build of Go via env var on ${{ matrix.os }}'
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, windows-latest, macos-latest]
+    env:
+      GO_DOWNLOAD_BASE_URL: 'https://aka.ms/golang/release/latest'
+    steps:
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+
+      - name: Setup Microsoft build of Go via environment variable
+        uses: ./
+        with:
+          go-version: '1.25'
+          cache: false
+
+      - name: Verify Go installation
+        run: go version
+
+      - name: Verify Go is functional
+        shell: bash
+        run: |
+          mkdir -p /tmp/test-go && cd /tmp/test-go
+          cat > main.go << 'EOF'
+          package main
+          import "fmt"
+          func main() {
+            fmt.Println("Hello from Microsoft build of Go via env var!")
+          }
+          EOF
+          go run main.go
+
+  microsoft-architecture:
+    name: 'Microsoft build of Go arch ${{ matrix.architecture }} on ${{ matrix.os }}'
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, macos-latest]
+        architecture: [x64]
+        include:
+          - os: macos-latest
+            architecture: arm64
+    steps:
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+
+      - name: Setup Microsoft build of Go with architecture
+        uses: ./
+        with:
+          go-version: '1.25'
+          go-download-base-url: 'https://aka.ms/golang/release/latest'
+          architecture: ${{ matrix.architecture }}
+          cache: false
+
+      - name: Verify Go installation
+        run: go version
+
+  microsoft-with-cache:
+    name: 'Microsoft build of Go with caching on ${{ matrix.os }}'
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, windows-latest, macos-latest]
+    steps:
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+
+      - name: Setup Microsoft build of Go with caching
+        uses: ./
+        with:
+          go-version: '1.25'
+          go-download-base-url: 'https://aka.ms/golang/release/latest'
+          cache: true
+
+      - name: Verify Go installation
+        run: go version
+
+      - name: Verify Go is functional
+        shell: bash
+        run: |
+          mkdir -p /tmp/test-go && cd /tmp/test-go
+          go mod init test
+          cat > main.go << 'EOF'
+          package main
+          import "fmt"
+          func main() {
+            fmt.Println("Hello from cached Microsoft build of Go!")
+          }
+          EOF
+          go run main.go

.github/workflows/publish-immutable-actions.yml

@@ -0,0 +1,20 @@
+name: 'Publish Immutable Action Version'
+
+on:
+  release:
+    types: [published]
+
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      id-token: write
+      packages: write
+
+    steps:
+      - name: Checking out
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+      - name: Publish
+        id: publish
+        uses: actions/publish-immutable-action@v0.0.4

.github/workflows/release-new-action-version.yml

@@ -1,4 +1,5 @@
 name: Release new action version
+
 on:
   release:
     types: [released]
@@ -21,7 +22,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Update the ${{ env.TAG_NAME }} tag
-        uses: actions/publish-action@v0.2.1
+        uses: actions/publish-action@v0.4.0
         with:
           source-tag: ${{ env.TAG_NAME }}
           slack-webhook: ${{ secrets.SLACK_WEBHOOK }}

.github/workflows/update-config-files.yml

@@ -0,0 +1,11 @@
+name: Update configuration files
+
+on:
+  schedule:
+    - cron: '0 3 * * 0'
+  workflow_dispatch:
+
+jobs:
+  call-update-configuration-files:
+    name: Update configuration files
+    uses: actions/reusable-workflows/.github/workflows/update-config-files.yml@main

.github/workflows/versions.yml

@@ -1,4 +1,5 @@
 name: Validate 'setup-go'
+
 on:
   push:
     branches:
@@ -17,9 +18,9 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
+        os: [ubuntu-latest, windows-latest, macos-latest, macos-15-intel]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
       - name: Setup Go Stable
         uses: ./
         with:
@@ -32,29 +33,56 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
+        os: [ubuntu-latest, windows-latest, macos-latest, macos-15-intel]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
       - name: Setup Go oldStable
         uses: ./
         with:
           go-version: oldstable
       - name: Verify Go
         run: go version
-  
-  aliases-arch:
+
+  go-env-outputs:
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest, macos-latest]
+    steps:
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+      - name: Setup Go
+        id: setup-go
+        uses: ./
+        with:
+          go-version: stable
+      - name: Show Go environment outputs
+        run: |
+          echo "GOPATH:       ${{ steps.setup-go.outputs.GOPATH }}"
+          echo "GOBIN:        ${{ steps.setup-go.outputs.GOBIN }}"
+          echo "go-bin-path:  ${{ steps.setup-go.outputs.go-bin-path }}"
+          echo "GOROOT:       ${{ steps.setup-go.outputs.GOROOT }}"
+          echo "GOCACHE:      ${{ steps.setup-go.outputs.GOCACHE }}"
+          echo "GOMODCACHE:   ${{ steps.setup-go.outputs.GOMODCACHE }}"
+          echo "GOOS:         ${{ steps.setup-go.outputs.GOOS }}"
+          echo "GOARCH:       ${{ steps.setup-go.outputs.GOARCH }}"
+          echo "GOTOOLDIR:    ${{ steps.setup-go.outputs.GOTOOLDIR }}"
+
+  aliases-arch:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, windows-latest, macos-latest, macos-15-intel]
         version: [stable, oldstable]
         architecture: [x64, x32]
         exclude:
-        - os: macos-latest
-          architecture: x32
+          - os: macos-latest
+            architecture: x32
+          - os: macos-15-intel
+            architecture: x32
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
       - name: Setup Go ${{ matrix.version }} ${{ matrix.architecture }}
         uses: ./
         with:
@@ -69,11 +97,17 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-latest, windows-latest, ubuntu-latest]
-        go: [1.17, 1.18, 1.19]
+        os: [macos-latest, windows-latest, ubuntu-latest, macos-15-intel]
+        go: [1.21.13, 1.22.8, 1.23.2]
+        include:
+          - os: windows-latest
+            go: 1.20.14
+        exclude:
+          - os: windows-latest
+            go: 1.23.2
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
 
       - name: setup-go ${{ matrix.go }}
         uses: ./
@@ -89,10 +123,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
-        go-version: [1.16, 1.17]
+        os: [ubuntu-latest, windows-latest, macos-latest, macos-15-intel]
+        go-version: ['1.20', '1.21', '1.22', '1.23']
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
       - name: Setup Go and check latest
         uses: ./
         with:
@@ -106,15 +140,15 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
+        os: [ubuntu-latest, windows-latest, macos-latest, macos-15-intel]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
       - name: Setup Go and check latest
         uses: ./
         with:
           go-version-file: __tests__/data/go.mod
       - name: verify go
-        run: __tests__/verify-go.sh 1.14
+        run: __tests__/verify-go.sh 1.20.14
         shell: bash
 
   go-version-file-with-gowork:
@@ -122,28 +156,59 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
+        os: [ubuntu-latest, windows-latest, macos-latest, macos-15-intel]
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
       - name: Setup Go and check latest
         uses: ./
         with:
           go-version-file: __tests__/data/go.work
       - name: verify go
-        run: __tests__/verify-go.sh 1.19
+        run: __tests__/verify-go.sh 1.21
         shell: bash
 
-  setup-versions-from-manifest:
-    name: Setup ${{ matrix.go }} ${{ matrix.os }}
+  go-version-file-with-tool-versions:
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-latest, windows-latest, ubuntu-latest]
-        go: [1.12.16, 1.13.11, 1.14.3]
+        os: [ubuntu-latest, windows-latest, macos-latest, macos-15-intel]
+    steps:
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+      - name: Setup Go and check latest
+        uses: ./
+        with:
+          go-version-file: __tests__/data/.tool-versions
+      - name: verify go
+        run: __tests__/verify-go.sh 1.23.2
+        shell: bash
+
+  go-version-file-with-go-version:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, windows-latest, macos-latest, macos-15-intel]
+    steps:
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+      - name: Setup Go from .go-version file
+        uses: ./
+        with:
+          go-version-file: __tests__/data/.go-version
+      - name: verify go
+        run: __tests__/verify-go.sh 1.22.4
+        shell: bash
+
+  setup-versions-from-manifest:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [macos-latest, windows-latest, ubuntu-latest, macos-15-intel]
+        go: [1.20.14, 1.21.10, 1.22.8, 1.23.2]
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
 
       - name: setup-go ${{ matrix.go }}
         uses: ./
@@ -155,16 +220,15 @@ jobs:
         shell: bash
 
   setup-versions-from-dist:
-    name: Setup ${{ matrix.go }} ${{ matrix.os }}
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
-        os: [macos-latest, windows-latest, ubuntu-latest]
-        go: [1.9, 1.8.6]
+        os: [windows-latest, ubuntu-latest, macos-15-intel]
+        go: [1.11.12]
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
 
       - name: setup-go ${{ matrix.go }}
         uses: ./
@@ -180,14 +244,23 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, windows-latest, macos-latest]
-        go-version: [1.16, 1.17]
+        os: [ubuntu-latest, windows-latest, macos-latest, macos-15-intel]
+        go-version: [1.20.14, 1.21, 1.22, 1.23]
+        include:
+          - os: macos-latest
+            architecture: arm64
+          - os: ubuntu-latest
+            architecture: x64
+          - os: windows-latest
+            architecture: x64
+          - os: macos-15-intel
+            architecture: x64
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
       - name: Setup Go and check latest
         uses: ./
         with:
           go-version: ${{ matrix.go-version }}
-          architecture: x64
+          architecture: ${{ matrix.architecture }}
       - name: Verify Go
         run: go version

.github/workflows/windows-validation.yml

@@ -0,0 +1,136 @@
+name: Validate Windows installation
+
+on:
+  push:
+    branches:
+      - main
+    paths-ignore:
+      - '**.md'
+  pull_request:
+    paths-ignore:
+      - '**.md'
+
+jobs:
+  create-link-if-not-default:
+    runs-on: windows-latest
+    name: 'Validate if symlink is created'
+    strategy:
+      matrix:
+        cache: [false, true]
+        go: [1.20.1]
+    steps:
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+
+      - name: 'Setup ${{ matrix.cache }}, cache: ${{ matrix.go }}'
+        uses: ./
+        with:
+          go-version: ${{ matrix.go }}
+          cache: ${{ matrix.cache }}
+
+      - name: 'Drive C: should have zero size link'
+        run: |
+          du -m -s 'C:\hostedtoolcache\windows\go\${{ matrix.go }}\x64'
+          # make sure drive c: contains only a link
+          size=$(du -m -s 'C:\hostedtoolcache\windows\go\${{ matrix.go }}\x64'|cut -f1 -d$'\t')
+          if [ $size -ne 0 ];then
+            echo 'Size of the link created on drive c: must be 0'
+            exit 1
+          fi
+        shell: bash
+
+      # Drive D: is small, take care the action does not eat up the space
+      - name: 'Drive D: space usage should be below 1G'
+        run: |
+          du -m -s 'D:\hostedtoolcache\windows\go\${{ matrix.go }}\x64'
+          size=$(du -m -s 'D:\hostedtoolcache\windows\go\${{ matrix.go }}\x64'|cut -f1 -d$'\t')
+          # make sure archive does not take lot of space
+          if [ $size -gt 999 ];then
+            echo 'Size of installed on drive d: go is too big';
+            exit 1
+          fi
+        shell: bash
+
+      # make sure the Go installation has not been changed to the end user
+      - name: Test paths and environments
+        run: |
+          echo $PATH
+          which go
+          go version
+          go env
+          if [ $(which go) != '/c/hostedtoolcache/windows/go/${{ matrix.go }}/x64/bin/go' ];then
+            echo 'which go should return "/c/hostedtoolcache/windows/go/${{ matrix.go }}/x64/bin/go"'
+            exit 1
+          fi
+          if [ $(go env GOROOT) != 'C:\hostedtoolcache\windows\go\${{ matrix.go }}\x64' ];then
+            echo 'go env GOROOT should return "C:\hostedtoolcache\windows\go\${{ matrix.go }}\x64"'
+            exit 1
+          fi
+        shell: bash
+
+  find-default-go:
+    name: 'Find default go version'
+    runs-on: windows-latest
+    outputs:
+      version: ${{ steps.goversion.outputs.version }}
+    steps:
+      - run: |
+          version=`go env GOVERSION|sed s/^go//`
+          echo "default go version: $version"
+          echo "version=$version" >> "$GITHUB_OUTPUT"
+        id: goversion
+        shell: bash
+
+  dont-create-link-if-default:
+    name: 'Validate if symlink is not created for default go'
+    runs-on: windows-latest
+    needs: find-default-go
+    strategy:
+      matrix:
+        cache: [false, true]
+    steps:
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+
+      - name: 'Setup default go, cache: ${{ matrix.cache }}'
+        uses: ./
+        with:
+          go-version: ${{ needs.find-default-go.outputs.version }}
+          cache: ${{ matrix.cache }}
+
+      - name: 'Drive C: should have Go installation, cache: ${{ matrix.cache}}'
+        run: |
+          size=$(du -m -s 'C:\hostedtoolcache\windows\go\${{ needs.find-default-go.outputs.version }}\x64'|cut -f1 -d$'\t')
+          if [ $size -eq 0 ];then
+            echo 'Size of the hosted go installed on drive c: must be above zero'
+            exit 1
+          fi
+        shell: bash
+
+      - name: 'Drive D: should not have Go installation, cache: ${{ matrix.cache }}'
+        run: |
+          if [ -e 'D:\hostedtoolcache\windows\go\${{ needs.find-default-go.outputs.version }}\x64' ];then
+            echo 'D:\hostedtoolcache\windows\go\${{ needs.find-default-go.outputs.version }}\x64 should not exist for hosted version of go';
+            exit 1
+          fi
+        shell: bash
+
+  hostedtoolcache:
+    name: 'Validate if hostedtoolcache works as expected'
+    runs-on: windows-latest
+    strategy:
+      matrix:
+        cache: [false]
+        go: [1.20.1]
+    steps:
+      - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
+
+      - name: 'Setup ${{ matrix.go }}, cache: ${{ matrix.cache }}'
+        uses: ./
+        with:
+          go-version: ${{ matrix.go }}
+          cache: ${{ matrix.cache }}
+
+      - name: 'Setup ${{ matrix.go }}, cache: ${{ matrix.cache }} (from hostedtoolcache)'
+        uses: ./
+        with:
+          go-version: ${{ matrix.go }}
+          cache: ${{ matrix.cache }}

.github/workflows/workflow.yml

@@ -1,39 +0,0 @@
-name: build-test
-on:
-  push:
-    branches:
-      - main
-    paths-ignore:
-      - '**.md'
-  pull_request:
-    paths-ignore:
-      - '**.md'
-jobs:
-  run:
-    name: Run
-    runs-on: ${{ matrix.operating-system }}
-    strategy:
-      matrix:
-        operating-system: [ubuntu-latest, windows-latest]
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Setup node 16
-        uses: actions/setup-node@v3
-        with:
-          node-version: 16
-          cache: npm
-
-      - name: npm ci
-        run: npm ci
-
-      - name: Lint
-        run: npm run format-check
-
-      - name: npm test
-        run: npm test
-
-      - name: audit packages
-        run: npm audit --audit-level=high
-        if: matrix.operating-system == 'ubuntu-latest'

.licensed.yml

@@ -10,6 +10,10 @@ allowed:
   - cc0-1.0
   - unlicense
   - 0bsd
+  - blueoak-1.0.0
 
 reviewed:
-  npm:
+  npm:
+     - "@actions/http-client"
+     - "balanced-match"
+     - "brace-expansion"

.prettierignore

@@ -0,0 +1,7 @@
+# Ignore list
+/*
+
+# Do not ignore these folders:
+!__tests__/
+!.github/
+!src/

.prettierrc.json

@@ -1,11 +1,10 @@
 {
-    "printWidth": 80,
-    "tabWidth": 2,
-    "useTabs": false,
-    "semi": true,
-    "singleQuote": true,
-    "trailingComma": "none",
-    "bracketSpacing": false,
-    "arrowParens": "avoid",
-    "parser": "typescript"
-  }
+  "printWidth": 80,
+  "tabWidth": 2,
+  "useTabs": false,
+  "semi": true,
+  "singleQuote": true,
+  "trailingComma": "none",
+  "bracketSpacing": false,
+  "arrowParens": "avoid"
+}

CODEOWNERS

@@ -1 +1 @@
-* @actions/actions-service
+* @actions/setup-actions-team

README.md

@@ -1,224 +1,156 @@
 # setup-go
 
-[![build-test](https://github.com/actions/setup-go/actions/workflows/workflow.yml/badge.svg)](https://github.com/actions/setup-go/actions/workflows/workflow.yml)
+[![Basic validation](https://github.com/actions/setup-go/actions/workflows/basic-validation.yml/badge.svg)](https://github.com/actions/setup-go/actions/workflows/basic-validation.yml)
 [![Validate 'setup-go'](https://github.com/actions/setup-go/actions/workflows/versions.yml/badge.svg)](https://github.com/actions/setup-go/actions/workflows/versions.yml)
 
-This action sets up a go environment for use in actions by:
+This action sets up a Go environment for use in GitHub Actions by:
 
-- Optionally downloading and caching a version of Go by version and adding to `PATH`.
-- Registering problem matchers for error output.
+- Optionally downloading and caching a version of Go by version and adding it to the PATH
+- Optionally caching Go modules and build outputs
+- Registering problem matchers for error output
 
-# V3
 
-The V3 edition of the action offers:
+## What's new in V7
 
-- Adds `GOBIN` to the `PATH`
-- Proxy support
-- Check latest version
-- Caching packages dependencies
-- stable and oldstable aliases
-- Bug Fixes (including issues around version matching and semver)
+The V7 edition of the action includes:
+- Migrated action internals to ESM for compatibility with latest `@actions/*` packages. No changes to action inputs, outputs, or behavior.
 
-The action will first check the local cache for a version match. If a version is not found locally, it will pull it from the `main` branch of the [go-versions](https://github.com/actions/go-versions/blob/main/versions-manifest.json) repository. On miss or failure, it will fall back to downloading directly from [go dist](https://storage.googleapis.com/golang). To change the default behavior, please use the [check-latest input](#check-latest-version).
+## Breaking changes in V6
 
-**Note:** The `setup-go` action uses executable binaries which are built by Golang side. The action does not build golang from source code.
+The V6 edition of the action includes:
+- **Upgraded Node.js runtime from node20 to node24**
+  > Make sure your runner is on version v2.327.1 or later to ensure compatibility with this release. See [Release Notes](https://github.com/actions/runner/releases/tag/v2.327.1)
 
-Matching by [semver spec](https://github.com/npm/node-semver):
+- **Go toolchain**
+  - Supports both `go` and `toolchain` directives in `go.mod`. If the `toolchain` directive is present, its version is used; otherwise, the action falls back to the `go` directive.
 
+- **Cache key update**
+  - By default, the cache key for Go modules is based on `go.mod`. To use `go.sum`, configure the `cache-dependency-path` input.
+
+See full release notes on the [releases page](https://github.com/actions/setup-go/releases).
+
+## Usage
+
+See [action.yml](action.yml).
+
+<!-- start usage -->
 ```yaml
-steps:
-  - uses: actions/checkout@v3
-  - uses: actions/setup-go@v3
-    with:
-      go-version: '^1.13.1' # The Go version to download (if necessary) and use.
-  - run: go version
-```
-
-```yaml
-steps:
-  - uses: actions/checkout@v3
-  - uses: actions/setup-go@v3
-    with:
-      go-version: '>=1.17.0'
-  - run: go version
-```
-
-Matching an unstable pre-release:
-
-```yaml
-steps:
-  - uses: actions/checkout@v3
-  - uses: actions/setup-go@v3
-    with:
-      go-version: '1.18.0-rc.1' # The Go version to download (if necessary) and use.
-  - run: go version
-```
-
-```yaml
-steps:
-  - uses: actions/checkout@v3
-  - uses: actions/setup-go@v3
-    with:
-      go-version: '1.16.0-beta.1' # The Go version to download (if necessary) and use.
-  - run: go version
-```
-
-# Usage
-
-See [action.yml](action.yml)
-
-## Basic
-
-```yaml
-steps:
-  - uses: actions/checkout@v3
-  - uses: actions/setup-go@v3
-    with:
-      go-version: '1.16.1' # The Go version to download (if necessary) and use.
-  - run: go run hello.go
-```
-
-
-## Check latest version
-
-The `check-latest` flag defaults to `false`. Use the default or set `check-latest` to `false` if you prefer stability and if you want to ensure a specific Go version is always used.
-
-If `check-latest` is set to `true`, the action first checks if the cached version is the latest one. If the locally cached version is not the most up-to-date, a Go version will then be downloaded. Set `check-latest` to `true` if you want the most up-to-date Go version to always be used.
-
-> Setting `check-latest` to `true` has performance implications as downloading Go versions is slower than using cached versions.
-
-```yaml
-steps:
-  - uses: actions/checkout@v3
-  - uses: actions/setup-go@v3
-    with:
-      go-version: '1.14'
-      check-latest: true
-  - run: go run hello.go
-```
-
-## Using stable/oldstable aliases
-
-If `stable` is provided, action will get the latest stable version from the [`go-versions`](https://github.com/actions/go-versions/blob/main/versions-manifest.json) repository manifest. 
-
-If `oldstable` is provided, when current release is 1.19.x, action will resolve version as 1.18.x, where x is the latest patch release.
-
-**Note:** using these aliases will result in same version as using corresponding minor release with `check-latest` input set to `true`
-
-```yaml
-steps:
-  - uses: actions/checkout@v3
-  - uses: actions/setup-go@v3
-    with:
-      go-version: 'stable'
-  - run: go run hello.go
-```
-
-```yaml
-steps:
-  - uses: actions/checkout@v3
-  - uses: actions/setup-go@v3
-    with:
-      go-version: 'oldstable'
-  - run: go run hello.go
-```
-
-## Caching dependency files and build outputs:
-
-The action has a built-in functionality for caching and restoring go modules and build outputs. It uses [actions/cache](https://github.com/actions/cache) under the hood but requires less configuration settings. The `cache` input is optional, and caching is turned off by default.
-
-The action defaults to search for the dependency file - go.sum in the repository root, and uses its hash as a part of the cache key. Use `cache-dependency-path` input for cases when multiple dependency files are used, or they are located in different subdirectories.
-
-**Caching without specifying dependency file path**
-```yaml
-steps:
-  - uses: actions/checkout@v3
-  - uses: actions/setup-go@v3
-    with:
-      go-version: '1.17'
-      check-latest: true
-      cache: true
-  - run: go run hello.go
-```
-
-**Caching in monorepos**
-```yaml
-steps:
-  - uses: actions/checkout@v3
-  - uses: actions/setup-go@v3
-    with:
-      go-version: '1.17'
-      check-latest: true
-      cache: true
-      cache-dependency-path: subdir/go.sum
-  - run: go run hello.go
-  ```
-## Getting go version from the go.mod file
-
-The `go-version-file` input accepts a path to a `go.mod` file or a `go.work` file that contains the version of Go to be used by a project. As the `go.mod` file contains only major and minor (e.g. 1.18) tags, the action will search for the latest available patch version sequentially in the runner's directory with the cached tools, in the [version-manifest.json](https://github.com/actions/go-versions/blob/main/versions-manifest.json) file or at the go servers.
-
-If both the `go-version` and the `go-version-file` inputs are provided then the `go-version` input is used.
-> The action will search for the `go.mod` file relative to the repository root
-
-```yaml
-steps:
-- uses: actions/checkout@v3
-- uses: actions/setup-go@v3
+- uses: actions/setup-go@v7
   with:
-    go-version-file: 'path/to/go.mod'
-- run: go version
+    # Version or version range of Go to use
+    go-version: '1.23'
+    
+    # Path to go.mod, go.work, .go-version, or .tool-versions file
+    # Note: if both go-version and go-version-file are provided, go-version takes precedence.
+    go-version-file: 'go.mod'
+    
+    # Set this option if you want the action to check for the latest available version
+    # Default: false
+    check-latest: false
+    
+    # GitHub token for authentication
+    token: ${{ github.token }}
+    
+    # Used to specify whether caching is needed.
+    # Default: true
+    cache: true
+    
+    # Path to dependency files for caching
+    cache-dependency-path: 'go.sum'
+    
+    # Architecture to install (auto-detected if not specified)
+    architecture: 'x64'
+    
+    # Custom base URL for Go downloads (e.g., for mirrors)
+    go-download-base-url: ''
 ```
+<!-- end usage -->
 
-## Matrix testing
+**Basic:**
 
 ```yaml
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        go: [ '1.14', '1.13' ]
-    name: Go ${{ matrix.go }} sample
-    steps:
-      - uses: actions/checkout@v3
-      - name: Setup go
-        uses: actions/setup-go@v3
-        with:
-          go-version: ${{ matrix.go }}
-      - run: go run hello.go
+steps:
+  - uses: actions/checkout@v7
+  - uses: actions/setup-go@v7
+    with:
+      go-version: '1.25' # The Go version to download (if necessary) and use.
+  - run: go run hello.go
 ```
 
-### Supported version syntax
+**Version resolution behavior:**
+
+The action resolves the requested version in the following order:
+1. **Local cache** - Checks the local tool cache for a matching [semver](https://github.com/npm/node-semver#versions) version.
+2. **go-versions repository** - If the requested version isn’t available in the tool cache, it pulls the version manifest from the `main` branch of the [go-versions repository](https://github.com/actions/go-versions/blob/main/versions-manifest.json).
+3. **Direct download** - If that lookup misses or fails, it will fall back to downloading directly from the [official Go distribution site](https://go.dev/dl).
+
+To change the default behavior, please use
+the [check-latest input](docs/advanced-usage.md#check-latest-version).
+
+> **Note**: The `setup-go` action uses executable binaries built by the Go team and does not build Go binaries from source code.
+
+## Supported version syntax
 
 The `go-version` input supports the following syntax:
 
-- Specific versions: `1.15`, `1.16.1`, `1.17.0-rc.2`, `1.16.0-beta.1`
-- SemVer's version range syntax: `^1.13.1`, `>=1.18.0-rc.1`
+- Specific versions: `1.25`, `1.24.11`, `1.24.0-rc.1`, `1.23.0-beta.1`
+- SemVer version range syntax: `^1.25.1`, `~1.24.1`, `>=1.25.0-rc.1`, `<1.25.0`, `>=1.22.0 <1.24.0`
+- Aliases: `stable`, `oldstable`
+- Wildcards: `1.25.x`, `1.x`
 
-For more information about semantic versioning, please refer to [semver](https://github.com/npm/node-semver) documentation.
+For details on Semantic Versioning, see [the semver package documentation](https://github.com/npm/node-semver).
 
-## Using `setup-go` on GHES
+> **Note**: Due to the peculiarities of YAML parsing, it is recommended to wrap the version in single quotation marks:
+>
+> ```yaml
+>   go-version: '1.20'
+> ```
+>
+> The recommendation is based on the YAML parser's behavior, which interprets non-wrapped values as numbers and, in the case of version `1.20`, trims it down to `1.2`, which may not be very obvious.
 
-`setup-go` comes pre-installed on the appliance with GHES if Actions is enabled. When dynamically downloading Go distributions, `setup-go` downloads distributions from [`actions/go-versions`](https://github.com/actions/go-versions) on github.com (outside of the appliance). These calls to `actions/go-versions` are made via unauthenticated requests, which are limited to [60 requests per hour per IP](https://docs.github.com/en/rest/overview/resources-in-the-rest-api#rate-limiting). If more requests are made within the time frame, then you will start to see rate-limit errors during downloading that looks like: `##[error]API rate limit exceeded for...`. After that error the action will try to download versions directly from https://storage.googleapis.com/golang, but it also can have rate limit so it's better to put token.
+For more usage examples, please refer to the section: [Using go-version input](docs/advanced-usage.md#using-the-go-version-input) of the [Advanced usage](docs/advanced-usage.md) guide.
 
-To get a higher rate limit, you can [generate a personal access token on github.com](https://github.com/settings/tokens/new) and pass it as the `token` input for the action:
+## Recommended permissions
+
+When using the `setup-go` action in your GitHub Actions workflow, it is recommended to set the following permissions to ensure proper functionality:
 
 ```yaml
-uses: actions/setup-go@v3
-with:
-  token: ${{ secrets.GH_DOTCOM_TOKEN }}
-  go-version: 1.18
+permissions:
+  contents: read # access to check out code and install dependencies
 ```
 
-If the runner is not able to access github.com, any Go versions requested during a workflow run must come from the runner's tool cache. See "[Setting up the tool cache on self-hosted runners without internet access](https://docs.github.com/en/enterprise-server@3.2/admin/github-actions/managing-access-to-actions-from-githubcom/setting-up-the-tool-cache-on-self-hosted-runners-without-internet-access)" for more information.
+## Caching dependency files and build outputs
 
-# License
+The action includes built-in caching and restoration for Go modules and build outputs. It uses
+[toolkit/cache](https://github.com/actions/toolkit/tree/main/packages/cache) under the hood, but requires less configuration.
+The `cache` input is optional, and caching is enabled by default. To disable caching, set `cache: false`.
 
-The scripts and documentation in this project are released under the [MIT License](LICENSE)
+By default, the action looks for `go.mod` in the repository root and uses its hash as part of the cache key. Use the `cache-dependency-path` input when you have multiple dependency files, or when they’re located in different subdirectories. This input supports glob patterns.
 
-# Contributions
+Module sources (`GOMODCACHE`) and build outputs (`GOCACHE`) are cached separately. On the same runner OS, module sources can be reused across Go versions and runner architectures, while build outputs remain partitioned by Go version, runner architecture, and Linux runner image. The `cache-hit` output is `true` only when both cache entries are restored on their primary keys.
 
-Contributions are welcome! See [Contributor's Guide](docs/contributors.md)
+If caching cannot be performed for any reason, the action logs a warning and continues workflow execution.
+
+For examples of using `cache-dependency-path`, see the [Caching](docs/advanced-usage.md#caching) section of the [Advanced usage](docs/advanced-usage.md) guide.
+
+
+## Advanced usage
+
+- [Using the go-version input](docs/advanced-usage.md#using-the-go-version-input)
+- [Using the go-version-file input](docs/advanced-usage.md#using-the-go-version-file-input)
+- [Check latest version](docs/advanced-usage.md#check-latest-version)
+- [Caching](docs/advanced-usage.md#caching)
+- [Outputs](docs/advanced-usage.md#outputs)
+- [Custom download URL](docs/advanced-usage.md#custom-download-url)
+- [Using `setup-go` on GHES](docs/advanced-usage.md#using-setup-go-on-ghes)
+
+## License
+
+The scripts and documentation in this project are released under the [MIT License](LICENSE).
+
+## Contributions
+
+Contributions are welcome! See our [Contributor's Guide](docs/contributors.md).
 
 ## Code of Conduct
 

__tests__/cache-restore.test.ts

@@ -1,99 +1,373 @@
-import * as cache from '@actions/cache';
-import * as core from '@actions/core';
-import * as glob from '@actions/glob';
+/// <reference types="node" />
 
-import * as cacheRestore from '../src/cache-restore';
-import * as cacheUtils from '../src/cache-utils';
-import {PackageManagerInfo} from '../src/package-managers';
+import {jest, describe, it, expect, beforeEach, afterEach} from '@jest/globals';
+import fs from 'fs';
+
+jest.unstable_mockModule('@actions/cache', () => ({
+  saveCache: jest.fn(),
+  restoreCache: jest.fn(),
+  isFeatureAvailable: jest.fn()
+}));
+
+jest.unstable_mockModule('@actions/glob', () => ({
+  create: jest.fn(),
+  hashFiles: jest.fn()
+}));
+
+jest.unstable_mockModule('@actions/core', () => ({
+  info: jest.fn(),
+  warning: jest.fn(),
+  debug: jest.fn(),
+  error: jest.fn(),
+  notice: jest.fn(),
+  setFailed: jest.fn(),
+  setOutput: jest.fn(),
+  getInput: jest.fn(),
+  getBooleanInput: jest.fn(),
+  getMultilineInput: jest.fn(),
+  addPath: jest.fn(),
+  exportVariable: jest.fn(),
+  saveState: jest.fn(),
+  getState: jest.fn(),
+  setSecret: jest.fn(),
+  isDebug: jest.fn(() => false),
+  startGroup: jest.fn(),
+  endGroup: jest.fn(),
+  group: jest.fn((_name: string, fn: () => Promise<unknown>) => fn()),
+  toPlatformPath: jest.fn((p: string) => p),
+  toWin32Path: jest.fn((p: string) => p),
+  toPosixPath: jest.fn((p: string) => p)
+}));
+
+// Import real cache-utils (with mocked @actions) before mocking it
+const realCacheUtils = await import('../src/cache-utils.js');
+
+jest.unstable_mockModule('../src/cache-utils.js', () => ({
+  ...realCacheUtils,
+  getCacheDirectoryPath: jest.fn()
+}));
+
+const cache = await import('@actions/cache');
+const core = await import('@actions/core');
+const glob = await import('@actions/glob');
+const cacheRestore = await import('../src/cache-restore.js');
+const cacheUtils = await import('../src/cache-utils.js');
+const {run: saveCaches} = await import('../src/cache-save.js');
+import type {CacheDirectory} from '../src/cache-utils.js';
+
+function deferred() {
+  let resolve!: () => void;
+  const promise = new Promise<void>(done => {
+    resolve = done;
+  });
+  return {promise, resolve};
+}
 
 describe('restoreCache', () => {
-  //Arrange
-  let hashFilesSpy = jest.spyOn(glob, 'hashFiles');
-  let getCacheDirectoryPathSpy = jest.spyOn(
-    cacheUtils,
-    'getCacheDirectoryPath'
-  );
-  let restoreCacheSpy = jest.spyOn(cache, 'restoreCache');
-  let infoSpy = jest.spyOn(core, 'info');
-  let setOutputSpy = jest.spyOn(core, 'setOutput');
+  const hashFilesSpy = glob.hashFiles as jest.Mock<typeof glob.hashFiles>;
+  const getCacheDirectoryPathSpy =
+    cacheUtils.getCacheDirectoryPath as jest.Mock<
+      typeof cacheUtils.getCacheDirectoryPath
+    >;
+  const restoreCacheSpy = cache.restoreCache as jest.Mock<
+    typeof cache.restoreCache
+  >;
+  const saveCacheSpy = cache.saveCache as jest.Mock<typeof cache.saveCache>;
+  const infoSpy = core.info as jest.Mock<typeof core.info>;
+  const setOutputSpy = core.setOutput as jest.Mock<typeof core.setOutput>;
 
   const versionSpec = '1.13.1';
   const packageManager = 'default';
   const cacheDependencyPath = 'path';
+  const modulePath = 'module_cache_directory';
+  const buildPath = 'build_cache_directory';
+  const directories: CacheDirectory[] = [
+    {kind: 'modules', path: modulePath},
+    {kind: 'build', path: buildPath}
+  ];
+  const originalEnv = {...process.env};
+  const originalArch = Object.getOwnPropertyDescriptor(process, 'arch')!;
 
   beforeEach(() => {
-    getCacheDirectoryPathSpy.mockImplementation(
-      (PackageManager: PackageManagerInfo) => {
-        return new Promise<string[]>(resolve => {
-          resolve(['cache_directory_path', 'cache_directory_path']);
-        });
-      }
-    );
+    jest.resetAllMocks();
+    process.env = {
+      ...originalEnv,
+      GITHUB_WORKSPACE: '/test/workspace',
+      RUNNER_OS: 'Linux',
+      ImageOS: 'ubuntu24'
+    };
+    Object.defineProperty(process, 'arch', {value: 'x64'});
+    hashFilesSpy.mockResolvedValue('file_hash');
+    getCacheDirectoryPathSpy.mockResolvedValue(directories);
+    restoreCacheSpy.mockResolvedValue(undefined);
+    saveCacheSpy.mockResolvedValue(1);
   });
 
+  afterEach(() => {
+    process.env = {...originalEnv};
+    Object.defineProperty(process, 'arch', originalArch);
+    jest.restoreAllMocks();
+  });
+
+  const restore = (version = versionSpec) =>
+    cacheRestore.restoreCache(version, packageManager, cacheDependencyPath);
+
+  const requestedKeys = () => {
+    const moduleCall = restoreCacheSpy.mock.calls.find(
+      ([paths]) => paths[0] === modulePath
+    );
+    const buildCall = restoreCacheSpy.mock.calls.find(
+      ([paths]) => paths[0] === buildPath
+    );
+    expect(moduleCall).toBeDefined();
+    expect(buildCall).toBeDefined();
+    return {modules: moduleCall![1], build: buildCall![1]};
+  };
+
   it('should throw if dependency file path is not valid', async () => {
-    //Arrange
-    hashFilesSpy.mockImplementation((somePath: string) => {
-      return new Promise<string>(resolve => {
-        resolve('');
-      });
-    });
+    hashFilesSpy.mockResolvedValue('');
 
-    //Act + Assert
-    expect(async () => {
-      await cacheRestore.restoreCache(
-        versionSpec,
-        packageManager,
-        cacheDependencyPath
-      );
-    }).rejects.toThrowError(
+    await expect(restore()).rejects.toThrow(
       'Some specified paths were not resolved, unable to cache dependencies.'
     );
+    expect(restoreCacheSpy).not.toHaveBeenCalled();
+    expect(setOutputSpy).toHaveBeenLastCalledWith('cache-hit', false);
   });
 
-  it('should inform if cache hit is not occured', async () => {
-    //Arrange
-    hashFilesSpy.mockImplementation((somePath: string) => {
-      return new Promise<string>(resolve => {
-        resolve('file_hash');
-      });
-    });
+  it('restores modules and build outputs as separate cache entries', async () => {
+    await restore();
 
-    restoreCacheSpy.mockImplementation(() => {
-      return new Promise<string>(resolve => {
-        resolve('');
-      });
-    });
+    const keys = requestedKeys();
+    expect(keys.modules).not.toBe(keys.build);
+    expect(restoreCacheSpy).toHaveBeenCalledTimes(2);
+    expect(restoreCacheSpy).toHaveBeenCalledWith([modulePath], keys.modules);
+    expect(restoreCacheSpy).toHaveBeenCalledWith([buildPath], keys.build);
+    expect(infoSpy).toHaveBeenCalledWith('modules cache is not found');
+    expect(infoSpy).toHaveBeenCalledWith('build cache is not found');
+  });
+
+  it.each([false, true])(
+    'restores entries sequentially and waits for both (first fails=%s)',
+    async firstFails => {
+      const started = [deferred(), deferred()];
+      const release = [deferred(), deferred()];
+      let completed = false;
+      restoreCacheSpy.mockImplementation(async (paths, key) => {
+        const index = paths[0] === modulePath ? 0 : 1;
+        started[index].resolve();
+        await release[index].promise;
+        if (index === 0 && firstFails) {
+          throw new Error('Module cache unavailable');
+        }
+        return key;
+      });
+
+      const pending = restore().then(() => {
+        completed = true;
+      });
+      try {
+        await started[0].promise;
+        expect(restoreCacheSpy).toHaveBeenCalledTimes(1);
+        expect(core.saveState).not.toHaveBeenCalled();
+        expect(setOutputSpy).not.toHaveBeenCalledWith('cache-hit', true);
+
+        release[0].resolve();
+        await started[1].promise;
+        expect(restoreCacheSpy).toHaveBeenCalledTimes(2);
+        expect(completed).toBe(false);
+        expect(core.saveState).not.toHaveBeenCalled();
+        expect(setOutputSpy).not.toHaveBeenCalledWith('cache-hit', true);
+      } finally {
+        release.forEach(signal => signal.resolve());
+        await pending;
+      }
+
+      expect(setOutputSpy).toHaveBeenLastCalledWith('cache-hit', !firstFails);
+      expect(core.saveState).toHaveBeenCalledTimes(1);
+    }
+  );
+
+  it.each([
+    {modules: false, build: false},
+    {modules: true, build: false},
+    {modules: false, build: true},
+    {modules: true, build: true}
+  ])(
+    'reports hits and saves misses independently (modules=$modules, build=$build)',
+    async hits => {
+      const state = new Map<string, string>();
+      (core.saveState as jest.Mock<typeof core.saveState>).mockImplementation(
+        (name, value) => {
+          state.set(name, JSON.stringify(value));
+        }
+      );
+      (core.getState as jest.Mock<typeof core.getState>).mockImplementation(
+        name => state.get(name) || ''
+      );
+      (
+        core.getBooleanInput as jest.Mock<typeof core.getBooleanInput>
+      ).mockReturnValue(true);
+      jest.spyOn(fs, 'existsSync').mockReturnValue(true);
+      restoreCacheSpy.mockImplementation(async (paths, key) =>
+        hits[paths[0] === modulePath ? 'modules' : 'build'] ? key : undefined
+      );
+
+      await restore();
+      const keys = requestedKeys();
+      expect(setOutputSpy).toHaveBeenLastCalledWith(
+        'cache-hit',
+        hits.modules && hits.build
+      );
+
+      // Changing the Go environment later must not change the saved paths.
+      process.env.GOMODCACHE = 'different_module_cache';
+      process.env.GOCACHE = 'different_build_cache';
+      await saveCaches();
+
+      for (const {kind, path} of directories) {
+        if (hits[kind]) {
+          expect(saveCacheSpy).not.toHaveBeenCalledWith([path], keys[kind]);
+        } else {
+          expect(saveCacheSpy).toHaveBeenCalledWith([path], keys[kind]);
+        }
+      }
+      expect(saveCacheSpy).toHaveBeenCalledTimes(
+        Number(!hits.modules) + Number(!hits.build)
+      );
+    }
+  );
+
+  it('does not report a full hit for a non-primary cache match', async () => {
+    restoreCacheSpy.mockImplementation(async (_paths, key) => `${key}-other`);
+
+    await restore();
+
+    expect(setOutputSpy).toHaveBeenLastCalledWith('cache-hit', false);
+  });
+
+  it.each(directories)(
+    'continues restoring when the $kind cache fails',
+    async ({kind, path}) => {
+      restoreCacheSpy.mockImplementation(async (paths, key) => {
+        if (paths[0] === path) {
+          throw new Error('Unable to reach the service');
+        }
+        return key;
+      });
+
+      await restore();
+
+      expect(restoreCacheSpy).toHaveBeenCalledTimes(2);
+      expect(core.warning).toHaveBeenCalledWith(
+        `Restore ${kind} cache failed: Unable to reach the service`
+      );
+      expect(setOutputSpy).toHaveBeenLastCalledWith('cache-hit', false);
+    }
+  );
+
+  it.each(directories)(
+    'restores only $kind when the other directory cannot be resolved',
+    async directory => {
+      getCacheDirectoryPathSpy.mockResolvedValue([directory]);
+      restoreCacheSpy.mockImplementation(async (_paths, key) => key);
+
+      await restore();
+
+      expect(restoreCacheSpy).toHaveBeenCalledTimes(1);
+      expect(restoreCacheSpy).toHaveBeenCalledWith(
+        [directory.path],
+        expect.any(String)
+      );
+      expect(setOutputSpy).toHaveBeenLastCalledWith('cache-hit', false);
+    }
+  );
+
+  it('reuses modules across Go versions without reusing build outputs', async () => {
+    await restore();
+    const before = requestedKeys();
+    restoreCacheSpy.mockClear();
+
+    await restore('1.26.1');
+    const after = requestedKeys();
+
+    expect(after.modules).toBe(before.modules);
+    expect(after.build).not.toBe(before.build);
+  });
+
+  it.each([
+    {
+      name: 'runner architecture',
+      change: () => Object.defineProperty(process, 'arch', {value: 'arm64'})
+    },
+    {
+      name: 'runner image',
+      change: () => {
+        process.env.ImageOS = 'ubuntu26';
+      }
+    }
+  ])('reuses only modules when the $name changes', async ({change}) => {
+    await restore();
+    const before = requestedKeys();
+    restoreCacheSpy.mockClear();
+
+    change();
+    await restore();
+    const after = requestedKeys();
+
+    expect(after.modules).toBe(before.modules);
+    expect(after.build).not.toBe(before.build);
+  });
+
+  it('keeps both cache entries isolated by runner OS', async () => {
+    await restore();
+    const before = requestedKeys();
+    restoreCacheSpy.mockClear();
+
+    process.env.RUNNER_OS = 'Windows';
+    await restore();
+    const after = requestedKeys();
+
+    expect(after.modules).not.toBe(before.modules);
+    expect(after.build).not.toBe(before.build);
+  });
+
+  it('invalidates both cache entries when the dependency hash changes', async () => {
+    await restore();
+    const before = requestedKeys();
+    restoreCacheSpy.mockClear();
+
+    hashFilesSpy.mockResolvedValue('different_file_hash');
+    await restore();
+    const after = requestedKeys();
+
+    expect(after.modules).not.toBe(before.modules);
+    expect(after.build).not.toBe(before.build);
+  });
+
+  it('hashes the configured dependency paths for both cache entries', async () => {
+    const dependencyPaths = 'go.sum\ntools/go.sum';
 
-    //Act + Assert
     await cacheRestore.restoreCache(
       versionSpec,
       packageManager,
-      cacheDependencyPath
+      dependencyPaths
     );
-    expect(infoSpy).toBeCalledWith(`Cache is not found`);
+
+    expect(hashFilesSpy).toHaveBeenCalledWith(dependencyPaths);
+    expect(restoreCacheSpy).toHaveBeenCalledTimes(2);
   });
 
-  it('should set output if cache hit is occured', async () => {
-    //Arrange
-    hashFilesSpy.mockImplementation((somePath: string) => {
-      return new Promise<string>(resolve => {
-        resolve('file_hash');
-      });
-    });
+  it('should throw if dependency file is not found in workspace', async () => {
+    jest.spyOn(fs, 'readdirSync').mockReturnValue(['main.go'] as any);
 
-    restoreCacheSpy.mockImplementation(() => {
-      return new Promise<string>(resolve => {
-        resolve('cache_key');
-      });
-    });
-
-    //Act + Assert
-    await cacheRestore.restoreCache(
-      versionSpec,
-      packageManager,
-      cacheDependencyPath
+    await expect(
+      cacheRestore.restoreCache(
+        versionSpec,
+        packageManager
+        // No cacheDependencyPath
+      )
+    ).rejects.toThrow(
+      'Dependencies file is not found in /test/workspace. Supported file pattern: go.mod'
     );
-    expect(setOutputSpy).toBeCalledWith('cache-hit', true);
   });
 });

__tests__/cache-save.test.ts

@@ -0,0 +1,285 @@
+/// <reference types="node" />
+
+import {jest, describe, it, expect, beforeEach, afterEach} from '@jest/globals';
+
+jest.unstable_mockModule('@actions/cache', () => ({
+  saveCache: jest.fn(),
+  restoreCache: jest.fn(),
+  isFeatureAvailable: jest.fn()
+}));
+
+jest.unstable_mockModule('@actions/core', () => ({
+  info: jest.fn(),
+  warning: jest.fn(),
+  debug: jest.fn(),
+  error: jest.fn(),
+  setFailed: jest.fn(),
+  getInput: jest.fn(),
+  getBooleanInput: jest.fn(),
+  getState: jest.fn(),
+  saveState: jest.fn()
+}));
+
+const realFs = (await import('fs')).default;
+const fsExports = {...realFs, existsSync: jest.fn()};
+jest.unstable_mockModule('fs', () => ({...fsExports, default: fsExports}));
+
+const cache = await import('@actions/cache');
+const core = await import('@actions/core');
+const fs = (await import('fs')).default;
+const {run} = await import('../src/cache-save.js');
+import type {CacheEntry} from '../src/cache-utils.js';
+
+function deferred() {
+  let resolve!: () => void;
+  const promise = new Promise<void>(done => {
+    resolve = done;
+  });
+  return {promise, resolve};
+}
+
+describe('cache-save', () => {
+  let entries: CacheEntry[];
+
+  const getBooleanInputSpy = jest.mocked(core.getBooleanInput);
+  const getStateSpy = jest.mocked(core.getState);
+  const infoSpy = jest.mocked(core.info);
+  const warningSpy = jest.mocked(core.warning);
+  const debugSpy = jest.mocked(core.debug);
+  const setFailedSpy = jest.mocked(core.setFailed);
+  const saveCacheSpy = jest.mocked(cache.saveCache);
+  const existsSpy = jest.mocked(fs.existsSync);
+
+  beforeEach(() => {
+    jest.resetAllMocks();
+    entries = [
+      {
+        kind: 'modules',
+        path: 'module_cache_directory',
+        primaryKey: 'modules-primary-key'
+      },
+      {
+        kind: 'build',
+        path: 'build_cache_directory',
+        primaryKey: 'build-primary-key'
+      }
+    ];
+
+    getBooleanInputSpy.mockReturnValue(true);
+    getStateSpy.mockImplementation(() => JSON.stringify(entries));
+    saveCacheSpy.mockResolvedValue(0);
+    existsSpy.mockReturnValue(true);
+  });
+
+  afterEach(() => {
+    jest.restoreAllMocks();
+  });
+
+  it('does not save cache when the cache input is false', async () => {
+    getBooleanInputSpy.mockReturnValue(false);
+
+    await run();
+
+    expect(saveCacheSpy).not.toHaveBeenCalled();
+    expect(warningSpy).not.toHaveBeenCalled();
+    expect(setFailedSpy).not.toHaveBeenCalled();
+  });
+
+  it.each([false, true])(
+    'starts both saves concurrently and waits before exiting (first fails=%s)',
+    async firstFails => {
+      const started = [deferred(), deferred()];
+      const release = [deferred(), deferred()];
+      const exitSpy = jest.spyOn(process, 'exit').mockImplementation(() => {
+        return undefined as never;
+      });
+      saveCacheSpy.mockImplementation(async paths => {
+        const index = paths[0] === entries[0].path ? 0 : 1;
+        started[index].resolve();
+        await release[index].promise;
+        if (index === 0 && firstFails) {
+          throw new Error('Module cache unavailable');
+        }
+        return 1;
+      });
+
+      const pending = run(true);
+      try {
+        await Promise.all(started.map(signal => signal.promise));
+        release[0].resolve();
+        // Let the first completion propagate while the second stays blocked.
+        await new Promise<void>(resolve => setImmediate(resolve));
+        expect(exitSpy).not.toHaveBeenCalled();
+      } finally {
+        release.forEach(signal => signal.resolve());
+        await pending;
+      }
+
+      expect(exitSpy).toHaveBeenCalledTimes(1);
+      expect(exitSpy).toHaveBeenCalledWith(0);
+      expect(infoSpy).toHaveBeenCalledWith(
+        `Cache saved with the key: ${entries[1].primaryKey}`
+      );
+      expect(setFailedSpy).not.toHaveBeenCalled();
+    }
+  );
+
+  it('does not save cache when there are no cache folders on the disk', async () => {
+    existsSpy.mockReturnValue(false);
+
+    await run();
+
+    for (const {kind, path} of entries) {
+      expect(infoSpy).toHaveBeenCalledWith(
+        `[warning]${kind} cache folder doesn't exist on disk: ${path}`
+      );
+    }
+    expect(saveCacheSpy).not.toHaveBeenCalled();
+    expect(setFailedSpy).not.toHaveBeenCalled();
+  });
+
+  it.each(['modules', 'build'])(
+    'saves the other cache when the %s directory is missing',
+    async kind => {
+      const missing = entries.find(entry => entry.kind === kind)!;
+      const existing = entries.find(entry => entry.kind !== kind)!;
+      existsSpy.mockImplementation(path => path !== missing.path);
+
+      await run();
+
+      expect(saveCacheSpy).toHaveBeenCalledTimes(1);
+      expect(saveCacheSpy).toHaveBeenCalledWith(
+        [existing.path],
+        existing.primaryKey
+      );
+      expect(setFailedSpy).not.toHaveBeenCalled();
+    }
+  );
+
+  it('does not save cache when no cache entries were prepared', async () => {
+    getStateSpy.mockReturnValue('');
+
+    await run();
+
+    expect(infoSpy).toHaveBeenCalledWith(
+      'Cache keys were not generated. Please check the log messages above for more errors or information'
+    );
+    expect(saveCacheSpy).not.toHaveBeenCalled();
+    expect(setFailedSpy).not.toHaveBeenCalled();
+  });
+
+  it('does not fail the workflow if the saved state is invalid', async () => {
+    getStateSpy.mockReturnValue('{');
+
+    await run();
+
+    expect(warningSpy).toHaveBeenCalledWith(expect.any(String));
+    expect(saveCacheSpy).not.toHaveBeenCalled();
+    expect(setFailedSpy).not.toHaveBeenCalled();
+  });
+
+  it('does not save either cache when both primary keys were hit', async () => {
+    for (const entry of entries) {
+      entry.matchedKey = entry.primaryKey;
+    }
+
+    await run();
+
+    expect(saveCacheSpy).not.toHaveBeenCalled();
+    expect(warningSpy).not.toHaveBeenCalled();
+    expect(setFailedSpy).not.toHaveBeenCalled();
+  });
+
+  it.each(['modules', 'build'])(
+    'skips only the %s cache when its primary key was hit',
+    async kind => {
+      const hit = entries.find(entry => entry.kind === kind)!;
+      const miss = entries.find(entry => entry.kind !== kind)!;
+      hit.matchedKey = hit.primaryKey;
+
+      await run();
+
+      expect(saveCacheSpy).toHaveBeenCalledTimes(1);
+      expect(saveCacheSpy).toHaveBeenCalledWith([miss.path], miss.primaryKey);
+      expect(warningSpy).not.toHaveBeenCalled();
+      expect(setFailedSpy).not.toHaveBeenCalled();
+    }
+  );
+
+  it('saves both cache directories under separate keys on a cold run', async () => {
+    await run();
+
+    expect(saveCacheSpy).toHaveBeenCalledTimes(2);
+    for (const {path, primaryKey} of entries) {
+      expect(saveCacheSpy).toHaveBeenCalledWith([path], primaryKey);
+      expect(infoSpy).toHaveBeenCalledWith(
+        `Cache saved with the key: ${primaryKey}`
+      );
+    }
+    expect(warningSpy).not.toHaveBeenCalled();
+    expect(setFailedSpy).not.toHaveBeenCalled();
+  });
+
+  it('saves caches restored from non-primary matches', async () => {
+    for (const entry of entries) {
+      entry.matchedKey = `${entry.primaryKey}-other`;
+    }
+
+    await run();
+
+    expect(saveCacheSpy).toHaveBeenCalledTimes(2);
+    expect(warningSpy).not.toHaveBeenCalled();
+    expect(setFailedSpy).not.toHaveBeenCalled();
+  });
+
+  it.each(['modules', 'build'])(
+    'continues saving when the %s cache reservation fails',
+    async kind => {
+      const failed = entries.find(entry => entry.kind === kind)!;
+      const saved = entries.find(entry => entry.kind !== kind)!;
+      saveCacheSpy.mockImplementation(async paths =>
+        paths[0] === failed.path ? -1 : 1
+      );
+
+      await run();
+
+      expect(saveCacheSpy).toHaveBeenCalledTimes(2);
+      expect(debugSpy).toHaveBeenCalledWith(
+        `Cache was not saved for the key: ${failed.primaryKey}`
+      );
+      expect(infoSpy).not.toHaveBeenCalledWith(
+        `Cache saved with the key: ${failed.primaryKey}`
+      );
+      expect(infoSpy).toHaveBeenCalledWith(
+        `Cache saved with the key: ${saved.primaryKey}`
+      );
+      expect(warningSpy).not.toHaveBeenCalled();
+      expect(setFailedSpy).not.toHaveBeenCalled();
+    }
+  );
+
+  it.each(['modules', 'build'])(
+    'continues saving when the %s cache upload throws',
+    async kind => {
+      const failed = entries.find(entry => entry.kind === kind)!;
+      const saved = entries.find(entry => entry.kind !== kind)!;
+      saveCacheSpy.mockImplementation(async paths => {
+        if (paths[0] === failed.path) {
+          throw new Error('Unable to reach the service');
+        }
+        return 1;
+      });
+
+      await run();
+
+      expect(saveCacheSpy).toHaveBeenCalledTimes(2);
+      expect(warningSpy).toHaveBeenCalledWith(
+        `Save ${kind} cache failed: Unable to reach the service`
+      );
+      expect(infoSpy).toHaveBeenCalledWith(
+        `Cache saved with the key: ${saved.primaryKey}`
+      );
+      expect(setFailedSpy).not.toHaveBeenCalled();
+    }
+  );
+});

__tests__/cache-utils.test.ts

@@ -1,22 +1,60 @@
-import * as exec from '@actions/exec';
-import * as cache from '@actions/cache';
-import * as core from '@actions/core';
-import * as cacheUtils from '../src/cache-utils';
-import {PackageManagerInfo} from '../src/package-managers';
+import {jest, describe, it, expect, beforeEach, afterAll} from '@jest/globals';
+
+jest.unstable_mockModule('@actions/exec', () => ({
+  exec: jest.fn(),
+  getExecOutput: jest.fn()
+}));
+
+jest.unstable_mockModule('@actions/cache', () => ({
+  saveCache: jest.fn(),
+  restoreCache: jest.fn(),
+  isFeatureAvailable: jest.fn()
+}));
+
+jest.unstable_mockModule('@actions/core', () => ({
+  info: jest.fn(),
+  warning: jest.fn(),
+  debug: jest.fn(),
+  error: jest.fn(),
+  notice: jest.fn(),
+  setFailed: jest.fn(),
+  setOutput: jest.fn(),
+  getInput: jest.fn(),
+  getBooleanInput: jest.fn(),
+  getMultilineInput: jest.fn(),
+  addPath: jest.fn(),
+  exportVariable: jest.fn(),
+  saveState: jest.fn(),
+  getState: jest.fn(),
+  setSecret: jest.fn(),
+  isDebug: jest.fn(() => false),
+  startGroup: jest.fn(),
+  endGroup: jest.fn(),
+  group: jest.fn((_name: string, fn: () => Promise<unknown>) => fn()),
+  toPlatformPath: jest.fn((p: string) => p),
+  toWin32Path: jest.fn((p: string) => p),
+  toPosixPath: jest.fn((p: string) => p)
+}));
+
+const exec = await import('@actions/exec');
+const cache = await import('@actions/cache');
+const core = await import('@actions/core');
+const cacheUtils = await import('../src/cache-utils.js');
+import type {PackageManagerInfo} from '../src/package-managers.js';
 
 describe('getCommandOutput', () => {
   //Arrange
-  let getExecOutputSpy = jest.spyOn(exec, 'getExecOutput');
+  const getExecOutputSpy = exec.getExecOutput as jest.Mock<
+    typeof exec.getExecOutput
+  >;
 
   it('should return trimmed stdout in case of successful exit code', async () => {
     //Arrange
     const stdoutResult = ' stdout ';
     const trimmedStdout = stdoutResult.trim();
 
-    getExecOutputSpy.mockImplementation((commandLine: string) => {
-      return new Promise<exec.ExecOutput>(resolve => {
-        resolve({exitCode: 0, stdout: stdoutResult, stderr: ''});
-      });
+    getExecOutputSpy.mockImplementation(async (commandLine: string) => {
+      return {exitCode: 0, stdout: stdoutResult, stderr: ''};
     });
 
     //Act + Assert
@@ -29,14 +67,12 @@ describe('getCommandOutput', () => {
     //Arrange
     const stderrResult = 'error message';
 
-    getExecOutputSpy.mockImplementation((commandLine: string) => {
-      return new Promise<exec.ExecOutput>(resolve => {
-        resolve({exitCode: 10, stdout: '', stderr: stderrResult});
-      });
+    getExecOutputSpy.mockImplementation(async (commandLine: string) => {
+      return {exitCode: 10, stdout: '', stderr: stderrResult};
     });
 
     //Act + Assert
-    expect(async () => {
+    await expect(async () => {
       await cacheUtils.getCommandOutput('command');
     }).rejects.toThrow();
   });
@@ -47,8 +83,11 @@ describe('getPackageManagerInfo', () => {
     //Arrange
     const packageManagerName = 'default';
     const expectedResult = {
-      dependencyFilePattern: 'go.sum',
-      cacheFolderCommandList: ['go env GOMODCACHE', 'go env GOCACHE']
+      dependencyFilePattern: 'go.mod',
+      cacheFolderCommandList: [
+        {kind: 'modules', command: 'go env GOMODCACHE'},
+        {kind: 'build', command: 'go env GOCACHE'}
+      ]
     };
 
     //Act + Assert
@@ -62,7 +101,7 @@ describe('getPackageManagerInfo', () => {
     const packageManagerName = 'invalidName';
 
     //Act + Assert
-    expect(async () => {
+    await expect(async () => {
       await cacheUtils.getPackageManagerInfo(packageManagerName);
     }).rejects.toThrow();
   });
@@ -70,22 +109,35 @@ describe('getPackageManagerInfo', () => {
 
 describe('getCacheDirectoryPath', () => {
   //Arrange
-  let getExecOutputSpy = jest.spyOn(exec, 'getExecOutput');
+  const getExecOutputSpy = exec.getExecOutput as jest.Mock<
+    typeof exec.getExecOutput
+  >;
 
   const validPackageManager: PackageManagerInfo = {
-    dependencyFilePattern: 'go.sum',
-    cacheFolderCommandList: ['go env GOMODCACHE', 'go env GOCACHE']
+    dependencyFilePattern: 'go.mod',
+    cacheFolderCommandList: [
+      {kind: 'modules', command: 'go env GOMODCACHE'},
+      {kind: 'build', command: 'go env GOCACHE'}
+    ]
   };
 
   it('should return path to the cache folders which specified package manager uses', async () => {
     //Arrange
-    getExecOutputSpy.mockImplementation((commandLine: string) => {
-      return new Promise<exec.ExecOutput>(resolve => {
-        resolve({exitCode: 0, stdout: 'path/to/cache/folder', stderr: ''});
-      });
+    getExecOutputSpy.mockImplementation(async (commandLine: string) => {
+      return {
+        exitCode: 0,
+        stdout:
+          commandLine === 'go env GOMODCACHE'
+            ? 'path/to/modules'
+            : 'path/to/build',
+        stderr: ''
+      };
     });
 
-    const expectedResult = ['path/to/cache/folder', 'path/to/cache/folder'];
+    const expectedResult = [
+      {kind: 'modules', path: 'path/to/modules'},
+      {kind: 'build', path: 'path/to/build'}
+    ];
 
     //Act + Assert
     return cacheUtils
@@ -93,15 +145,58 @@ describe('getCacheDirectoryPath', () => {
       .then(data => expect(data).toEqual(expectedResult));
   });
 
-  it('should throw if the specified package name is invalid', async () => {
-    getExecOutputSpy.mockImplementation((commandLine: string) => {
-      return new Promise<exec.ExecOutput>(resolve => {
-        resolve({exitCode: 10, stdout: '', stderr: 'Error message'});
+  it.each(validPackageManager.cacheFolderCommandList)(
+    'preserves the $kind identity when the other command returns an empty path',
+    async ({kind, command}) => {
+      getExecOutputSpy.mockImplementation(async commandLine => ({
+        exitCode: 0,
+        stdout: commandLine === command ? 'path/to/cache/folder' : '',
+        stderr: ''
+      }));
+
+      await expect(
+        cacheUtils.getCacheDirectoryPath(validPackageManager)
+      ).resolves.toEqual([{kind, path: 'path/to/cache/folder'}]);
+    }
+  );
+
+  it.each(validPackageManager.cacheFolderCommandList)(
+    'preserves the $kind identity when the other command fails',
+    async ({kind, command}) => {
+      getExecOutputSpy.mockImplementation(async commandLine => {
+        if (commandLine !== command) {
+          throw new Error('Could not run go env');
+        }
+        return {exitCode: 0, stdout: 'path/to/cache/folder', stderr: ''};
       });
+
+      await expect(
+        cacheUtils.getCacheDirectoryPath(validPackageManager)
+      ).resolves.toEqual([{kind, path: 'path/to/cache/folder'}]);
+      expect(core.info).toHaveBeenCalledWith(
+        expect.stringContaining('Could not run go env')
+      );
+    }
+  );
+
+  it('should throw if the both commands return empty str', async () => {
+    getExecOutputSpy.mockImplementation(async (commandLine: string) => {
+      return {exitCode: 0, stdout: '', stderr: ''};
     });
 
     //Act + Assert
-    expect(async () => {
+    await expect(async () => {
+      await cacheUtils.getCacheDirectoryPath(validPackageManager);
+    }).rejects.toThrow();
+  });
+
+  it('should throw if both commands fail', async () => {
+    getExecOutputSpy.mockImplementation(async (commandLine: string) => {
+      return {exitCode: 10, stdout: '', stderr: 'Error message'};
+    });
+
+    //Act + Assert
+    await expect(async () => {
       await cacheUtils.getCacheDirectoryPath(validPackageManager);
     }).rejects.toThrow();
   });
@@ -109,8 +204,10 @@ describe('getCacheDirectoryPath', () => {
 
 describe('isCacheFeatureAvailable', () => {
   //Arrange
-  let isFeatureAvailableSpy = jest.spyOn(cache, 'isFeatureAvailable');
-  let warningSpy = jest.spyOn(core, 'warning');
+  const isFeatureAvailableSpy = cache.isFeatureAvailable as jest.Mock<
+    typeof cache.isFeatureAvailable
+  >;
+  const warningSpy = core.warning as jest.Mock<typeof core.warning>;
 
   it('should return true when cache feature is available', () => {
     //Arrange
@@ -118,16 +215,14 @@ describe('isCacheFeatureAvailable', () => {
       return true;
     });
 
-    let functionResult;
-
     //Act
-    functionResult = cacheUtils.isCacheFeatureAvailable();
+    const functionResult = cacheUtils.isCacheFeatureAvailable();
 
     //Assert
     expect(functionResult).toBeTruthy();
   });
 
-  it('should warn when cache feature is unavailable and GHES is not used ', () => {
+  it('should warn when cache feature is unavailable and GHES is not used', () => {
     //Arrange
     isFeatureAvailableSpy.mockImplementation(() => {
       return false;
@@ -135,7 +230,7 @@ describe('isCacheFeatureAvailable', () => {
 
     process.env['GITHUB_SERVER_URL'] = 'https://github.com';
 
-    let warningMessage =
+    const warningMessage =
       'The runner was not able to contact the cache service. Caching will be skipped';
 
     //Act
@@ -153,16 +248,14 @@ describe('isCacheFeatureAvailable', () => {
 
     process.env['GITHUB_SERVER_URL'] = 'https://github.com';
 
-    let functionResult;
-
     //Act
-    functionResult = cacheUtils.isCacheFeatureAvailable();
+    const functionResult = cacheUtils.isCacheFeatureAvailable();
 
     //Assert
     expect(functionResult).toBeFalsy();
   });
 
-  it('should throw when cache feature is unavailable and GHES is used', () => {
+  it('should warn when cache feature is unavailable and GHES is used', () => {
     //Arrange
     isFeatureAvailableSpy.mockImplementation(() => {
       return false;
@@ -170,10 +263,48 @@ describe('isCacheFeatureAvailable', () => {
 
     process.env['GITHUB_SERVER_URL'] = 'https://nongithub.com';
 
-    let errorMessage =
+    const warningMessage =
       'Cache action is only supported on GHES version >= 3.5. If you are on version >=3.5 Please check with GHES admin if Actions cache service is enabled or not.';
 
     //Act + Assert
-    expect(() => cacheUtils.isCacheFeatureAvailable()).toThrow(errorMessage);
+    expect(cacheUtils.isCacheFeatureAvailable()).toBeFalsy();
+    expect(warningSpy).toHaveBeenCalledWith(warningMessage);
+  });
+});
+
+describe('isGhes', () => {
+  const pristineEnv = {...process.env};
+
+  beforeEach(() => {
+    process.env = {...pristineEnv};
+  });
+
+  afterAll(() => {
+    process.env = pristineEnv;
+  });
+
+  it('returns false when the GITHUB_SERVER_URL environment variable is not defined', async () => {
+    delete process.env['GITHUB_SERVER_URL'];
+    expect(cacheUtils.isGhes()).toBeFalsy();
+  });
+
+  it('returns false when the GITHUB_SERVER_URL environment variable is set to github.com', async () => {
+    process.env['GITHUB_SERVER_URL'] = 'https://github.com';
+    expect(cacheUtils.isGhes()).toBeFalsy();
+  });
+
+  it('returns false when the GITHUB_SERVER_URL environment variable is set to a GitHub Enterprise Cloud-style URL', async () => {
+    process.env['GITHUB_SERVER_URL'] = 'https://contoso.ghe.com';
+    expect(cacheUtils.isGhes()).toBeFalsy();
+  });
+
+  it('returns false when the GITHUB_SERVER_URL environment variable has a .localhost suffix', async () => {
+    process.env['GITHUB_SERVER_URL'] = 'https://mock-github.localhost';
+    expect(cacheUtils.isGhes()).toBeFalsy();
+  });
+
+  it('returns true when the GITHUB_SERVER_URL environment variable is set to some other URL', async () => {
+    process.env['GITHUB_SERVER_URL'] = 'https://src.onpremise.fabrikam.com';
+    expect(cacheUtils.isGhes()).toBeTruthy();
   });
 });

__tests__/data/.go-version

@@ -0,0 +1 @@
+1.22.4

__tests__/data/.tool-versions

@@ -0,0 +1 @@
+golang 1.23.2

__tests__/data/go.mod

@@ -1,6 +1,6 @@
 module example.com/mymodule
 
-go 1.14
+go 1.20
 
 require (
 	example.com/othermodule v1.2.3

__tests__/data/go.work

@@ -1,3 +1,3 @@
-go 1.19
+go 1.21
 
 use .