Skip to content

Commit

Permalink
setup_go_with_cache: change additional-cache-key to `additional-goc…
Browse files Browse the repository at this point in the history
…ache-key`

and remove additional cache key from `gomodcache-key`

Signed-off-by: Norio Nomura <norio.nomura@gmail.com>
  • Loading branch information
norio-nomura committed Sep 9, 2024
1 parent 7f5c6c0 commit e57edb0
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
8 changes: 4 additions & 4 deletions .github/actions/setup_go_with_cache/action.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
name: setup go with cache
description: setup go with cache. export GOMODCACHE environment variable
inputs:
additional-cache-key:
description: additional cache key
additional-gocache-key:
description: additional cache key for GOCACHE
required: false
go-version:
description: go version
Expand Down Expand Up @@ -51,8 +51,8 @@ runs:
working-directory: ${{ inputs.working-directory }}
- id: base-key
run: |
echo "gomodcache-key=go-modcache-${{ inputs.working-directory }}-${{ inputs.additional-cache-key }}" >> $GITHUB_OUTPUT
echo "gocache-key=go-cache-${{ inputs.working-directory }}-${{ inputs.runs-on }}-${{ inputs.additional-cache-key }}" >> $GITHUB_OUTPUT
echo "gomodcache-key=go-modcache-${{ inputs.working-directory }}" >> $GITHUB_OUTPUT
echo "gocache-key=go-cache-${{ inputs.working-directory }}-${{ inputs.runs-on }}-${{ inputs.additional-gocache-key }}" >> $GITHUB_OUTPUT
shell: bash
- name: Cache go modules
uses: actions/cache@v4
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
fetch-depth: 1
- uses: ./.github/actions/setup_go_with_cache
with:
additional-cache-key: release
additional-gocache-key: release
go-version: 1.23.x
runs-on: macos-12
- name: Make darwin artifacts
Expand Down Expand Up @@ -59,7 +59,7 @@ jobs:
path: _artifacts/
- uses: ./.github/actions/setup_go_with_cache
with:
additional-cache-key: release
additional-gocache-key: release
go-version: 1.23.x
runs-on: ubuntu-20.04
- name: Install gcc-x86-64-linux-gnu
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ jobs:
fetch-depth: 1
- uses: ./.github/actions/setup_go_with_cache
with:
additional-cache-key: unit
additional-gocache-key: unit
go-version: ${{ matrix.go-version }}
runs-on: ubuntu-24.04
- name: Unit tests
Expand Down Expand Up @@ -130,7 +130,7 @@ jobs:
fetch-depth: 1
- uses: ./.github/actions/setup_go_with_cache
with:
additional-cache-key: windows
additional-gocache-key: windows
go-version: 1.23.x
runs-on: windows-2022-8-cores
- name: Unit tests
Expand Down Expand Up @@ -168,7 +168,7 @@ jobs:
fetch-depth: 1
- uses: ./.github/actions/setup_go_with_cache
with:
additional-cache-key: integration
additional-gocache-key: integration
go-version: 1.23.x
runs-on: macos-12
- name: Unit tests
Expand Down Expand Up @@ -373,7 +373,7 @@ jobs:
limactl sudoers | sudo tee /etc/sudoers.d/lima
- uses: ./.github/actions/setup_go_with_cache
with:
additional-cache-key: vmnet
additional-gocache-key: vmnet
go-version: 1.23.x
runs-on: macos-12
- name: Unit test (pkg/networks) with socket_vmnet
Expand Down

0 comments on commit e57edb0

Please sign in to comment.