From d6d8f55dca89f4a6cb468aa116a9b2939782d82e Mon Sep 17 00:00:00 2001 From: Stan Hu Date: Tue, 5 Aug 2025 23:07:49 -0700 Subject: [PATCH 1/2] chore: allow deps as a commitlint scope This will allow Renovate merge requests to pass CI. --- commitlint.config.js | 1 + 1 file changed, 1 insertion(+) diff --git a/commitlint.config.js b/commitlint.config.js index 943ee0e..eedcc3f 100644 --- a/commitlint.config.js +++ b/commitlint.config.js @@ -37,6 +37,7 @@ module.exports = { 'always', [ 'correlation', + 'deps', 'errortracking', 'log', 'mask', -- GitLab From ef39308d80a7863a2a56c2d53d0bdbbfc3d0ac65 Mon Sep 17 00:00:00 2001 From: Stan Hu Date: Tue, 5 Aug 2025 23:10:16 -0700 Subject: [PATCH 2/2] chore: update Go to 1.24.5 This should also fix the `go_unittests` job, which needs at least Go 1.23 right now: https://gitlab.com/gitlab-org/labkit/-/jobs/10929178679 Relates to https://gitlab.com/gitlab-org/labkit/-/issues/76 --- .gitlab-ci-asdf-versions.yml | 2 +- .tool-versions | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci-asdf-versions.yml b/.gitlab-ci-asdf-versions.yml index ce31382..185be80 100644 --- a/.gitlab-ci-asdf-versions.yml +++ b/.gitlab-ci-asdf-versions.yml @@ -1,6 +1,6 @@ # DO NOT MANUALLY EDIT; Run ./scripts/update-asdf-version-variables.sh to update this variables: - GL_ASDF_GOLANG_VERSION: "1.22.8" + GL_ASDF_GOLANG_VERSION: "1.24.5" GL_ASDF_GOLANGCI_LINT_VERSION: "1.64" GL_ASDF_PRE_COMMIT_VERSION: "4.1.0" GL_ASDF_SHELLCHECK_VERSION: "0.10" diff --git a/.tool-versions b/.tool-versions index ee5014c..cc9893c 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1,4 +1,4 @@ -golang 1.22.8 # datasource=docker depName=registry.gitlab.com/gitlab-com/gl-infra/common-ci-tasks-images/golang-fips +golang 1.24.5 # datasource=docker depName=registry.gitlab.com/gitlab-com/gl-infra/common-ci-tasks-images/golang-fips golangci-lint 1.64 # datasource=github-releases depName=golangci/golangci-lint pre-commit 4.1.0 # datasource=github-releases depName=pre-commit/pre-commit shellcheck 0.10 # datasource=github-releases depName=koalaman/shellcheck -- GitLab