From 6042818a7178b43d0fa0dbb0bbc07f57036de426 Mon Sep 17 00:00:00 2001 From: Matthias Bertschy Date: Tue, 24 Jun 2025 16:31:45 +0200 Subject: [PATCH] use go 1.24 Signed-off-by: Matthias Bertschy --- .github/workflows/00-pr-scanner.yaml | 2 +- .github/workflows/02-release.yaml | 2 +- .github/workflows/a-pr-scanner.yaml | 2 +- .github/workflows/b-binary-build-and-e2e-tests.yaml | 6 +++--- .github/workflows/build-image.yaml | 2 +- build/Dockerfile | 2 +- internal/testutils/dir.go | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/00-pr-scanner.yaml b/.github/workflows/00-pr-scanner.yaml index 4c82e490..16166719 100644 --- a/.github/workflows/00-pr-scanner.yaml +++ b/.github/workflows/00-pr-scanner.yaml @@ -66,7 +66,7 @@ jobs: COMPONENT_NAME: kubescape CGO_ENABLED: 0 GO111MODULE: "" - GO_VERSION: "1.23" + GO_VERSION: "1.24" RELEASE: "latest" CLIENT: test secrets: inherit diff --git a/.github/workflows/02-release.yaml b/.github/workflows/02-release.yaml index 49c46ea0..c21bc647 100644 --- a/.github/workflows/02-release.yaml +++ b/.github/workflows/02-release.yaml @@ -38,7 +38,7 @@ jobs: COMPONENT_NAME: kubescape CGO_ENABLED: 0 GO111MODULE: "" - GO_VERSION: "1.23" + GO_VERSION: "1.24" RELEASE: ${{ needs.retag.outputs.NEW_TAG }} CLIENT: release secrets: inherit diff --git a/.github/workflows/a-pr-scanner.yaml b/.github/workflows/a-pr-scanner.yaml index 6612cf02..a12445eb 100644 --- a/.github/workflows/a-pr-scanner.yaml +++ b/.github/workflows/a-pr-scanner.yaml @@ -92,7 +92,7 @@ jobs: - uses: actions/setup-go@v4 name: Installing go with: - go-version: "1.23" + go-version: "1.24" - name: Scanning - Forbidden Licenses (go-licenses) id: licenses-scan continue-on-error: true diff --git a/.github/workflows/b-binary-build-and-e2e-tests.yaml b/.github/workflows/b-binary-build-and-e2e-tests.yaml index 02272618..8f08181b 100644 --- a/.github/workflows/b-binary-build-and-e2e-tests.yaml +++ b/.github/workflows/b-binary-build-and-e2e-tests.yaml @@ -18,7 +18,7 @@ on: GO_VERSION: required: false type: string - default: "1.23" + default: "1.24" GO111MODULE: required: false type: string @@ -70,7 +70,7 @@ on: type: string GO_VERSION: type: string - default: "1.23" + default: "1.24" GO111MODULE: required: true type: string @@ -248,7 +248,7 @@ jobs: CGO_ENABLED: 0 GO111MODULE: "on" BUILD_PLATFORM: linux/amd64,linux/arm64 - GO_VERSION: "1.23" + GO_VERSION: "1.24" REQUIRED_TESTS: '[ "ks_microservice_create_2_cronjob_mitre_and_nsa_proxy", "ks_microservice_triggering_with_cron_job", diff --git a/.github/workflows/build-image.yaml b/.github/workflows/build-image.yaml index 5a7a43a3..f71c2766 100644 --- a/.github/workflows/build-image.yaml +++ b/.github/workflows/build-image.yaml @@ -33,7 +33,7 @@ jobs: CGO_ENABLED: 0 GO111MODULE: "on" BUILD_PLATFORM: ${{ inputs.PLATFORMS && 'linux/amd64,linux/arm64' || 'linux/amd64' }} - GO_VERSION: "1.23" + GO_VERSION: "1.24" REQUIRED_TESTS: '[]' COSIGN: ${{ inputs.CO_SIGN }} HELM_E2E_TEST: false diff --git a/build/Dockerfile b/build/Dockerfile index 777907a7..91586115 100644 --- a/build/Dockerfile +++ b/build/Dockerfile @@ -1,4 +1,4 @@ -FROM --platform=$BUILDPLATFORM golang:1.23-bookworm AS builder +FROM --platform=$BUILDPLATFORM golang:1.24-bookworm AS builder ENV GO111MODULE=on CGO_ENABLED=0 WORKDIR /work diff --git a/internal/testutils/dir.go b/internal/testutils/dir.go index 3f62346b..b420e84a 100644 --- a/internal/testutils/dir.go +++ b/internal/testutils/dir.go @@ -7,7 +7,7 @@ import ( // CurrentDir returns the directory of the file where this function is defined. func CurrentDir() string { - _, filename, ok := runtime.Caller(0) + _, filename, _, ok := runtime.Caller(1) if !ok { panic("failed to get current file info") }