From 013f71a6a3580bca4bde32753dc97b03d3c6be32 Mon Sep 17 00:00:00 2001 From: chenk Date: Sun, 19 May 2024 19:03:00 +0300 Subject: [PATCH] chore: auto-bump golang patch versions (#6711) Signed-off-by: chenk --- .github/workflows/auto-update-labels.yaml | 6 ++++-- .github/workflows/reusable-release.yaml | 3 ++- .github/workflows/test.yaml | 15 ++++++++------- 3 files changed, 14 insertions(+), 10 deletions(-) diff --git a/.github/workflows/auto-update-labels.yaml b/.github/workflows/auto-update-labels.yaml index f10febe7c070..5080e5d0a28c 100644 --- a/.github/workflows/auto-update-labels.yaml +++ b/.github/workflows/auto-update-labels.yaml @@ -5,7 +5,8 @@ on: - 'misc/triage/labels.yaml' branches: - main - +env: + GO_VERSION: '1.22' jobs: deploy: name: Auto-update labels @@ -17,7 +18,8 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version-file: go.mod + # cf. https://github.com/aquasecurity/trivy/pull/6711 + go-version: ${{ env.GO_VERSION }} - name: Install aqua tools uses: aquaproj/aqua-installer@v3.0.0 diff --git a/.github/workflows/reusable-release.yaml b/.github/workflows/reusable-release.yaml index 8f5d26a52922..39ca65809f06 100644 --- a/.github/workflows/reusable-release.yaml +++ b/.github/workflows/reusable-release.yaml @@ -14,6 +14,7 @@ on: env: GH_USER: "aqua-bot" + GO_VERSION: '1.22' jobs: release: @@ -76,7 +77,7 @@ jobs: - name: Setup Go uses: actions/setup-go@v5 with: - go-version-file: go.mod + go-version: ${{ env.GO_VERSION }} cache: false # Disable cache to avoid free space issues during `Post Setup Go` step. - name: Generate SBOM diff --git a/.github/workflows/test.yaml b/.github/workflows/test.yaml index 2717221220a2..c4b555f9539e 100644 --- a/.github/workflows/test.yaml +++ b/.github/workflows/test.yaml @@ -7,6 +7,8 @@ on: - 'mkdocs.yml' - 'LICENSE' merge_group: +env: + GO_VERSION: '1.22' jobs: test: name: Test @@ -30,8 +32,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version-file: go.mod - + go-version: ${{ env.GO_VERSION }} - name: go mod tidy run: | go mod tidy @@ -84,7 +85,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version-file: go.mod + go-version: ${{ env.GO_VERSION }} - name: Install tools uses: aquaproj/aqua-installer@v3.0.0 @@ -113,7 +114,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version-file: go.mod + go-version: ${{ env.GO_VERSION }} - name: Install tools uses: aquaproj/aqua-installer@v3.0.0 @@ -133,7 +134,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version-file: go.mod + go-version: ${{ env.GO_VERSION }} - name: Install tools uses: aquaproj/aqua-installer@v3.0.0 @@ -164,7 +165,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version-file: go.mod + go-version: ${{ env.GO_VERSION }} - name: Install tools uses: aquaproj/aqua-installer@v3.0.0 with: @@ -198,7 +199,7 @@ jobs: - name: Set up Go uses: actions/setup-go@v5 with: - go-version-file: go.mod + go-version: ${{ env.GO_VERSION }} - name: Determine GoReleaser ID id: goreleaser_id