diff options
| -rw-r--r-- | .github/workflows/ci.yml | 12 | ||||
| -rw-r--r-- | .github/workflows/cross-build.yml | 8 | ||||
| -rw-r--r-- | .github/workflows/release.yml | 8 |
3 files changed, 22 insertions, 6 deletions
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5a79fcd..05ec80f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -78,12 +78,20 @@ jobs: printf "Git version: $(git version)\n\n" # Calculate the short SHA1 hash of the git commit echo "::set-output name=short_sha::$(git rev-parse --short HEAD)" - echo "::set-output name=go_cache::$(go env GOCACHE)" - name: Cache the build cache uses: actions/cache@v2 with: - path: ${{ steps.vars.outputs.go_cache }} + # In order: + # * Module download cache + # * Build cache (Linux) + # * Build cache (Mac) + # * Build cache (Windows) + path: | + ~/go/pkg/mod + ~/.cache/go-build + ~/Library/Caches/go-build + ~\AppData\Local\go-build key: ${{ runner.os }}-${{ matrix.go }}-go-ci-${{ hashFiles('**/go.sum') }} restore-keys: | ${{ runner.os }}-${{ matrix.go }}-go-ci diff --git a/.github/workflows/cross-build.yml b/.github/workflows/cross-build.yml index 3ac9548..f37dc85 100644 --- a/.github/workflows/cross-build.yml +++ b/.github/workflows/cross-build.yml @@ -42,12 +42,16 @@ jobs: go env printf "\n\nSystem environment:\n\n" env - echo "::set-output name=go_cache::$(go env GOCACHE)" - name: Cache the build cache uses: actions/cache@v2 with: - path: ${{ steps.vars.outputs.go_cache }} + # In order: + # * Module download cache + # * Build cache (Linux) + path: | + ~/go/pkg/mod + ~/.cache/go-build key: cross-build-go${{ matrix.go }}-${{ matrix.goos }}-${{ hashFiles('**/go.sum') }} restore-keys: | cross-build-go${{ matrix.go }}-${{ matrix.goos }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 9c4db37..8024120 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -56,7 +56,6 @@ jobs: env echo "::set-output name=version_tag::${GITHUB_REF/refs\/tags\//}" echo "::set-output name=short_sha::$(git rev-parse --short HEAD)" - echo "::set-output name=go_cache::$(go env GOCACHE)" # Add "pip install" CLI tools to PATH echo ~/.local/bin >> $GITHUB_PATH @@ -91,7 +90,12 @@ jobs: - name: Cache the build cache uses: actions/cache@v2 with: - path: ${{ steps.vars.outputs.go_cache }} + # In order: + # * Module download cache + # * Build cache (Linux) + path: | + ~/go/pkg/mod + ~/.cache/go-build key: ${{ runner.os }}-go${{ matrix.go }}-release-${{ hashFiles('**/go.sum') }} restore-keys: | ${{ runner.os }}-go${{ matrix.go }}-release |