From e3df9a64e1aa933928fe19bc2ee9ea0b95a49349 Mon Sep 17 00:00:00 2001 From: e_forbes Date: Wed, 24 Sep 2025 15:05:45 +0100 Subject: [PATCH 1/4] feat: bumps the go major version to 1.24 --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index 080630c1..787594b6 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module gitlab.com/gitlab-org/labkit -go 1.23.0 +go 1.24.0 require ( cloud.google.com/go/profiler v0.1.0 -- GitLab From fe00ee6cd003eca4649fc86e1284ff8d2dc3037b Mon Sep 17 00:00:00 2001 From: e_forbes Date: Wed, 24 Sep 2025 15:10:27 +0100 Subject: [PATCH 2/4] Removes 1.23 from the matrix --- .gitlab-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6ca46dd3..68614620 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -44,7 +44,7 @@ variables: # have you reviewed # https://docs.gitlab.com/ee/development/go_guide/go_upgrade.html#testing-against-shipped-go-versions? # Generally, we should always support the latest 3 minor Go versions - - GO_VERSION: ["1.23", "1.24", "1.25"] + - GO_VERSION: ["1.24", "1.25"] .go-fips-version-matrix: parallel: @@ -52,7 +52,7 @@ variables: # NOTE: before changing the `GO_FIPS_VERSION` matrix, # have you reviewed # https://docs.gitlab.com/ee/development/go_guide/go_upgrade.html#testing-against-shipped-go-versions? - - GO_FIPS_VERSION: ["1.23", "1.24", "1.25"] + - GO_FIPS_VERSION: ["1.24", "1.25"] backwards_compat: image: registry.gitlab.com/gitlab-org/gitlab-build-images/debian-bookworm-golang-1.23-rust-1.73:git-2.45 -- GitLab From f543eef050650130a6fa52b267012d56bc74d5d7 Mon Sep 17 00:00:00 2001 From: e_forbes Date: Wed, 24 Sep 2025 15:17:13 +0100 Subject: [PATCH 3/4] Fixerooni --- .gitlab-ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 68614620..e8e9017e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -43,7 +43,6 @@ variables: # NOTE: before changing the `GO_VERSION` matrix, # have you reviewed # https://docs.gitlab.com/ee/development/go_guide/go_upgrade.html#testing-against-shipped-go-versions? - # Generally, we should always support the latest 3 minor Go versions - GO_VERSION: ["1.24", "1.25"] .go-fips-version-matrix: @@ -55,7 +54,7 @@ variables: - GO_FIPS_VERSION: ["1.24", "1.25"] backwards_compat: - image: registry.gitlab.com/gitlab-org/gitlab-build-images/debian-bookworm-golang-1.23-rust-1.73:git-2.45 + image: registry.gitlab.com/gitlab-org/gitlab-build-images/debian-bookworm-golang-1.24-rust-1.73:git-2.45 parallel: matrix: - REPO_AND_DIR: -- GitLab From 4830398ad9add8166148bcd8f69178012334d6ad Mon Sep 17 00:00:00 2001 From: e_forbes Date: Wed, 24 Sep 2025 16:30:12 +0100 Subject: [PATCH 4/4] testing --- .gitlab-ci.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e8e9017e..1c8d0288 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -43,7 +43,8 @@ variables: # NOTE: before changing the `GO_VERSION` matrix, # have you reviewed # https://docs.gitlab.com/ee/development/go_guide/go_upgrade.html#testing-against-shipped-go-versions? - - GO_VERSION: ["1.24", "1.25"] + # Generally, we should always support the latest 3 minor Go versions + - GO_VERSION: ["1.23", "1.24", "1.25"] .go-fips-version-matrix: parallel: @@ -51,7 +52,7 @@ variables: # NOTE: before changing the `GO_FIPS_VERSION` matrix, # have you reviewed # https://docs.gitlab.com/ee/development/go_guide/go_upgrade.html#testing-against-shipped-go-versions? - - GO_FIPS_VERSION: ["1.24", "1.25"] + - GO_FIPS_VERSION: ["1.23", "1.24", "1.25"] backwards_compat: image: registry.gitlab.com/gitlab-org/gitlab-build-images/debian-bookworm-golang-1.24-rust-1.73:git-2.45 -- GitLab