From 94c0de9b8d7d54c4f93562fef53099a9fefe4daf Mon Sep 17 00:00:00 2001 From: Shunsuke Suzuki Date: Mon, 30 Dec 2024 07:34:46 +0900 Subject: [PATCH] ci: use go-version-file (#3403) * ci: use go-version-file * chore: stop using go-version --- .github/workflows/debug-with-action-tmate.yaml | 2 +- .github/workflows/macos-test.yaml | 2 +- .github/workflows/wc-go-mod-tidy.yaml | 2 +- .github/workflows/wc-test.yaml | 2 +- .github/workflows/windows-test.yaml | 4 ++-- renovate.json5 | 1 - 6 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/debug-with-action-tmate.yaml b/.github/workflows/debug-with-action-tmate.yaml index 4bbe993aa..68721a57d 100644 --- a/.github/workflows/debug-with-action-tmate.yaml +++ b/.github/workflows/debug-with-action-tmate.yaml @@ -32,7 +32,7 @@ jobs: AQUA_GITHUB_TOKEN: ${{github.token}} - uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # v5.2.0 with: - go-version: 1.23.4 + go-version-file: go.mod # The default vim doesn't work well, so we install the latest vim ourselves. - uses: rhysd/action-setup-vim@acff3bc31a82af69a26f90af710926fdab04d00e # v1.3.5 diff --git a/.github/workflows/macos-test.yaml b/.github/workflows/macos-test.yaml index 0cddabc08..fa4c2f601 100644 --- a/.github/workflows/macos-test.yaml +++ b/.github/workflows/macos-test.yaml @@ -17,7 +17,7 @@ jobs: persist-credentials: false - uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # v5.2.0 with: - go-version: 1.23.4 + go-version-file: go.mod cache: true - run: go install ./cmd/aqua - run: echo "${XDG_DATA_HOME:-$HOME/.local/share}/aquaproj-aqua/bin" >> "$GITHUB_PATH" diff --git a/.github/workflows/wc-go-mod-tidy.yaml b/.github/workflows/wc-go-mod-tidy.yaml index ba1273ab0..1dfe0443a 100644 --- a/.github/workflows/wc-go-mod-tidy.yaml +++ b/.github/workflows/wc-go-mod-tidy.yaml @@ -11,7 +11,7 @@ jobs: go-mod-tidy: uses: suzuki-shunsuke/go-mod-tidy-workflow/.github/workflows/go-mod-tidy.yaml@79af8ebcd2dea45c27303b09192be80f7a35a37a # v1.1.0 with: - go-version: 1.23.4 + go-version-file: go.mod aqua_version: v2.40.0 secrets: gh_app_id: ${{secrets.gh_app_id}} diff --git a/.github/workflows/wc-test.yaml b/.github/workflows/wc-test.yaml index 0dab87a8e..e06ca857a 100644 --- a/.github/workflows/wc-test.yaml +++ b/.github/workflows/wc-test.yaml @@ -19,7 +19,7 @@ jobs: persist-credentials: false - uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # v5.2.0 with: - go-version: 1.23.4 + go-version-file: go.mod cache: true - run: go build -o /usr/local/bin/aqua ./cmd/aqua - run: echo "${XDG_DATA_HOME:-$HOME/.local/share}/aquaproj-aqua/bin" >> "$GITHUB_PATH" diff --git a/.github/workflows/windows-test.yaml b/.github/workflows/windows-test.yaml index 54d9f1a84..9537fb47c 100644 --- a/.github/workflows/windows-test.yaml +++ b/.github/workflows/windows-test.yaml @@ -44,7 +44,7 @@ jobs: - uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # v5.2.0 if: inputs.aqua_version == '' with: - go-version: 1.23.4 + go-version-file: go.mod cache: true - run: go install ./cmd/aqua if: inputs.aqua_version == '' @@ -133,7 +133,7 @@ jobs: - uses: actions/setup-go@3041bf56c941b39c61721a86cd11f3bb1338122a # v5.2.0 if: inputs.aqua_version == '' with: - go-version: 1.23.4 + go-version-file: go.mod cache: true - run: go install ./cmd/aqua if: inputs.aqua_version == '' diff --git a/renovate.json5 b/renovate.json5 index 53d387245..1984e4384 100644 --- a/renovate.json5 +++ b/renovate.json5 @@ -5,7 +5,6 @@ 'github>aquaproj/aqua-renovate-config#2.2.0', 'github>suzuki-shunsuke/renovate-config:nolimit#2.3.0', 'github>aquaproj/aqua-renovate-config:file#2.2.0(tests/aqua.*\\.yaml)', - 'github>suzuki-shunsuke/renovate-config:action-go-version#2.3.0', 'github>aquaproj/aqua-renovate-config:file#2.2.0(aqua/imports/.*\\.ya?ml)', 'github>aquaproj/aqua-renovate-config:installer-script#2.2.0(Dockerfile-prebuilt)', ],