fix caching for windows and tweak cache keys

mvdan · mvdan · commit 4b754729baa7 · 2022-03-02T22:04:14.000Z
It turns out that the globbing used by actions/cache does not actually
support reading env vars, and so the caching of GOCACHE on windows never
worked. Use the full path relative to $HOME.

We also start suggesting the inclusion of the Go version as part of the
cache key, because GOCACHE is different per go version.

Finally, bump the versions of setup-go and checkout.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -8,19 +8,19 @@ jobs:
         os: [ubuntu-latest, macos-latest, windows-latest]
     runs-on: ${{ matrix.os }}
     steps:
-    - uses: actions/setup-go@v2
+    - uses: actions/setup-go@v3
       with:
         go-version: ${{ matrix.go-version }}
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - run: go test ./...
 
   test-cache:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/setup-go@v2
+    - uses: actions/setup-go@v3
       with:
         go-version: 1.17.x
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - uses: actions/cache@v2
       with:
         # In order:
@@ -32,8 +32,8 @@ jobs:
           ~/go/pkg/mod
           ~/.cache/go-build
           ~/Library/Caches/go-build
-          %LocalAppData%\go-build
-        key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
+          ~\AppData\Local\go-build
+        key: ${{ runner.os }}-go-${{ matrix.go-version }}-${{ hashFiles('**/go.sum') }}
         restore-keys: |
-          ${{ runner.os }}-go-
+          ${{ runner.os }}-go-${{ matrix.go-version }}-
     - run: go test ./...
diff --git a/README.md b/README.md
@@ -17,10 +17,10 @@ jobs:
         os: [ubuntu-latest, macos-latest, windows-latest]
     runs-on: ${{ matrix.os }}
     steps:
-    - uses: actions/setup-go@v2
+    - uses: actions/setup-go@v3
       with:
         go-version: ${{ matrix.go-version }}
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
     - run: go test ./...
 ```
 
@@ -100,10 +100,10 @@ You can also include Go's build cache, to improve incremental builds:
       ~/go/pkg/mod
       ~/.cache/go-build
       ~/Library/Caches/go-build
-      %LocalAppData%\go-build
-    key: ${{ runner.os }}-go-${{ hashFiles('**/go.sum') }}
+      ~\AppData\Local\go-build
+    key: ${{ runner.os }}-go-${{ matrix.go-version }}-${{ hashFiles('**/go.sum') }}
     restore-keys: |
-      ${{ runner.os }}-go-
+      ${{ runner.os }}-go-${{ matrix.go-version }}-
 ```
 
 This is demonstrated via the `test-cache` job [in this very repository](https://github.com/mvdan/github-actions-golang/actions).
@@ -201,7 +201,7 @@ jobs:
       run:
         working-directory: ${{ env.GOPATH }}/src/github.com/${{ github.repository }}
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       with:
         path: ${{ env.GOPATH }}/src/github.com/${{ github.repository }}
 ```
