From 0182f014ef8da71fffef8876bdc868b9255e257e Mon Sep 17 00:00:00 2001 From: Mahe Tardy Date: Wed, 6 Dec 2023 10:23:49 +0000 Subject: [PATCH] workflows: add independent go-version for setup-go actions Signed-off-by: Mahe Tardy --- .github/renovate.json5 | 6 +++++- .github/workflows/build-clang-image.yaml | 3 ++- .github/workflows/build-images-ci.yml | 3 ++- .github/workflows/build-images-releases.yml | 3 ++- .github/workflows/generated-files.yaml | 2 +- .github/workflows/gotests.yml | 2 +- .github/workflows/lint-codeql.yml | 3 ++- .github/workflows/podinfo-test.yaml | 2 +- .github/workflows/run-e2e-tests.yaml | 2 +- .github/workflows/static-checks.yaml | 6 +++--- .github/workflows/vmtests.yml | 12 ++++++------ 11 files changed, 26 insertions(+), 18 deletions(-) diff --git a/.github/renovate.json5 b/.github/renovate.json5 index 6a45fa51069..44960766650 100644 --- a/.github/renovate.json5 +++ b/.github/renovate.json5 @@ -415,7 +415,11 @@ "^\\.github/workflows/[^/]+\\.ya?ml$" ], "matchStrings": [ - // this regex is used to match: + // this regex is used to match both: + // + // # renovate: datasource=golang-version depName=go + // go: '1.21.4' + // // # renovate: datasource=docker depName=quay.io/lvh-images/kernel-images // - 'bpf-next-20230912.113936' "# renovate: datasource=(?.*?) depName=(?.*?)\\s+.+ ['\"]?(?[^'\"\\s]*)" diff --git a/.github/workflows/build-clang-image.yaml b/.github/workflows/build-clang-image.yaml index 6b41d8f933a..baca719fe19 100644 --- a/.github/workflows/build-clang-image.yaml +++ b/.github/workflows/build-clang-image.yaml @@ -120,7 +120,8 @@ jobs: - name: Install Go uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0 with: - go-version-file: 'go.mod' + # renovate: datasource=golang-version depName=go + go-version: '1.21.5' - name: Install Bom shell: bash diff --git a/.github/workflows/build-images-ci.yml b/.github/workflows/build-images-ci.yml index 4bcce9ad10c..e97655fd6f7 100644 --- a/.github/workflows/build-images-ci.yml +++ b/.github/workflows/build-images-ci.yml @@ -93,7 +93,8 @@ jobs: - name: Install Go uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0 with: - go-version-file: 'go.mod' + # renovate: datasource=golang-version depName=go + go-version: '1.21.5' - name: Install Bom shell: bash diff --git a/.github/workflows/build-images-releases.yml b/.github/workflows/build-images-releases.yml index d72f6c32077..9fc656bf0a8 100644 --- a/.github/workflows/build-images-releases.yml +++ b/.github/workflows/build-images-releases.yml @@ -90,7 +90,8 @@ jobs: - name: Install Go uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0 with: - go-version-file: 'go.mod' + # renovate: datasource=golang-version depName=go + go-version: '1.21.5' - name: Install Bom if: ${{ startsWith(steps.tag.outputs.tag, 'v') }} diff --git a/.github/workflows/generated-files.yaml b/.github/workflows/generated-files.yaml index 920a3e25749..c5f56fa55bc 100644 --- a/.github/workflows/generated-files.yaml +++ b/.github/workflows/generated-files.yaml @@ -19,7 +19,7 @@ jobs: uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0 with: # renovate: datasource=golang-version depName=go - go-version: '1.21.1' + go-version: '1.21.5' - name: Go version run: go version - name: Validate that generated files are up to date. diff --git a/.github/workflows/gotests.yml b/.github/workflows/gotests.yml index 22b7b3ccf87..19c11ca6a7e 100644 --- a/.github/workflows/gotests.yml +++ b/.github/workflows/gotests.yml @@ -26,7 +26,7 @@ jobs: uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0 with: # renovate: datasource=golang-version depName=go - go-version: '1.21.1' + go-version: '1.21.5' - name: Install dependencies run: | diff --git a/.github/workflows/lint-codeql.yml b/.github/workflows/lint-codeql.yml index 856ea81b2dc..676e30ee6ad 100644 --- a/.github/workflows/lint-codeql.yml +++ b/.github/workflows/lint-codeql.yml @@ -57,7 +57,8 @@ jobs: - name: Install Go uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0 with: - go-version-file: 'go.mod' + # renovate: datasource=golang-version depName=go + go-version: '1.21.5' - name: Initialize CodeQL uses: github/codeql-action/init@407ffafae6a767df3e0230c3df91b6443ae8df75 # v2.22.8 with: diff --git a/.github/workflows/podinfo-test.yaml b/.github/workflows/podinfo-test.yaml index f9c8fa83387..2e9e5bc5977 100644 --- a/.github/workflows/podinfo-test.yaml +++ b/.github/workflows/podinfo-test.yaml @@ -39,7 +39,7 @@ jobs: uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0 with: # renovate: datasource=golang-version depName=go - go-version: '1.21.1' + go-version: '1.21.5' - name: Install Kind and create cluster uses: helm/kind-action@dda0770415bac9fc20092cacbc54aa298604d140 # v1.8.0 diff --git a/.github/workflows/run-e2e-tests.yaml b/.github/workflows/run-e2e-tests.yaml index c8371563c31..a1b265b021c 100644 --- a/.github/workflows/run-e2e-tests.yaml +++ b/.github/workflows/run-e2e-tests.yaml @@ -35,7 +35,7 @@ jobs: uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0 with: # renovate: datasource=golang-version depName=go - go-version: '1.21.1' + go-version: '1.21.5' - name: Set Up Job Variables id: vars diff --git a/.github/workflows/static-checks.yaml b/.github/workflows/static-checks.yaml index 5d88e4a626c..72e5f09bdb5 100644 --- a/.github/workflows/static-checks.yaml +++ b/.github/workflows/static-checks.yaml @@ -27,7 +27,7 @@ jobs: uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0 with: # renovate: datasource=golang-version depName=go - go-version: '1.21.1' + go-version: '1.21.5' # using golangci-lint cache instead cache: false @@ -48,7 +48,7 @@ jobs: uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0 with: # renovate: datasource=golang-version depName=go - go-version: '1.21.1' + go-version: '1.21.5' - name: Check gofmt formatting run: | @@ -78,7 +78,7 @@ jobs: uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0 with: # renovate: datasource=golang-version depName=go - go-version: '1.21.1' + go-version: '1.21.5' - name: Check module vendoring run: | diff --git a/.github/workflows/vmtests.yml b/.github/workflows/vmtests.yml index ae9029483c9..47376a385d2 100644 --- a/.github/workflows/vmtests.yml +++ b/.github/workflows/vmtests.yml @@ -18,17 +18,17 @@ jobs: group: ${{ github.ref }}-vmtest-build cancel-in-progress: true steps: - - name: Install Go - uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0 - with: - # renovate: datasource=golang-version depName=go - go-version: '1.21.1' - - name: Checkout code uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 with: path: go/src/github.com/cilium/tetragon/ + - name: Install Go + uses: actions/setup-go@93397bea11091df50f3d7e59dc26a7711a8bcfbe # v4.1.0 + with: + # renovate: datasource=golang-version depName=go + go-version: '1.21.5' + - name: Install build dependencies run: | sudo apt install libelf-dev netcat-traditional libcap-dev gcc