asdf-tool-versions.md

@@ -24,6 +24,6 @@ include:
   # and that ASDF is generally working
   # see https://gitlab.com/gitlab-com/gl-infra/common-ci-tasks/-/blob/main/asdf-tool-versions.md
   - project: 'gitlab-com/gl-infra/common-ci-tasks'
-    ref: v1.24.1 # renovate:managed
+    ref: v1.25.0 # renovate:managed
     file: asdf-tool-versions.yml
 ```

asdf-tool-versions.yml

 validate_asdf_tool_versions:
   stage: validate
   image:
-    name: registry.gitlab.com/gitlab-com/gl-infra/common-ci-tasks/renovate:v1.24.1
+    name: registry.gitlab.com/gitlab-com/gl-infra/common-ci-tasks/renovate:v1.25.0
     entrypoint: [""]
   needs: []
   variables:

editorconfig-check.md

@@ -14,6 +14,6 @@ include:
   # validate .editorconfig
   # see https://gitlab.com/gitlab-com/gl-infra/common-ci-tasks/-/blob/main/asdf-tool-versions.md
   - project: 'gitlab-com/gl-infra/common-ci-tasks'
-    ref: v1.24.1 # renovate:managed
+    ref: v1.25.0 # renovate:managed
     file: 'editorconfig-check.yml'
 ```

gitlab-scanners.md

@@ -11,6 +11,6 @@ stages:
 include:
   # see https://gitlab.com/gitlab-com/gl-infra/common-ci-tasks/-/blob/main/gitlab-scanners.md
   - project: 'gitlab-com/gl-infra/common-ci-tasks'
-    ref: v1.24.1 # renovate:managed
+    ref: v1.25.0 # renovate:managed
     file: 'gitlab-scanners.yml'
 ```

go-mod-tidy.md

@@ -19,6 +19,6 @@ include:
   # Perform `go mod tidy` and ensure that go.mod and go.sum are tidy.
   # see https://gitlab.com/gitlab-com/gl-infra/common-ci-tasks/-/blob/main/go-mod-tidy.md
   - project: 'gitlab-com/gl-infra/common-ci-tasks'
-    ref: v1.24.1 # renovate:managed
+    ref: v1.25.0 # renovate:managed
     file: go-mod-tidy.yml
 ```

go-unittests.md

@@ -20,7 +20,7 @@ include:
   # Runs Go unit tests
   # see https://gitlab.com/gitlab-com/gl-infra/common-ci-tasks/-/blob/main/go-unittests.md
   - project: 'gitlab-com/gl-infra/common-ci-tasks'
-    ref: v1.24.1 # renovate:managed
+    ref: v1.25.0 # renovate:managed
     file: go-unittests.yml
 ```
 

golangci-lint.md

@@ -13,6 +13,6 @@ include:
   # Runs golangci-lint on the project.
   # see https://gitlab.com/gitlab-com/gl-infra/common-ci-tasks/-/blob/main/golangci-lint.md
   - project: 'gitlab-com/gl-infra/common-ci-tasks'
-    ref: v1.24.1 # renovate:managed
+    ref: v1.25.0 # renovate:managed
     file: 'golangci-lint.yml'
 ```

goreleaser.md

@@ -78,6 +78,6 @@ include:
   # build binary release artifacts with goreleaser
   # see https://gitlab.com/gitlab-com/gl-infra/common-ci-tasks/-/blob/main/goreleaser.md
   - project: 'gitlab-com/gl-infra/common-ci-tasks'
-    ref: v1.24.1 # renovate:managed
+    ref: v1.25.0 # renovate:managed
     file: goreleaser.yml
 ```

kaniko.md

@@ -8,7 +8,7 @@ include:
   # Includes a base template for running kaniko easily
   # see https://gitlab.com/gitlab-com/gl-infra/common-ci-tasks/-/blob/main/kaniko.md
   - project: 'gitlab-com/gl-infra/common-ci-tasks'
-    ref: v1.24.1 # renovate:managed
+    ref: v1.25.0 # renovate:managed
     file: 'kaniko.yml'
 
 .container_builds:

renovate-bot.md

@@ -24,7 +24,7 @@ include:
   # Upgrades dependencies on a schedule
   # see https://gitlab.com/gitlab-com/gl-infra/common-ci-tasks/-/blob/main/renovate-bot.md
   - project: 'gitlab-com/gl-infra/common-ci-tasks'
-    ref: v1.24.1 # renovate:managed
+    ref: v1.25.0 # renovate:managed
     file: renovate-bot.yml
 ```
 

renovate-bot.yml

 renovate_bot:
   image:
-    name: registry.gitlab.com/gitlab-com/gl-infra/common-ci-tasks/renovate:v1.24.1
+    name: registry.gitlab.com/gitlab-com/gl-infra/common-ci-tasks/renovate:v1.25.0
     entrypoint: [""]
   stage: renovate_bot
   variables:

renovate-common.json

@@ -53,7 +53,6 @@
       "extractVersion": "^v?(?<version>.*)",
       "postUpgradeTasks": {
         "commands": [
-          "ASDF_DIR=/asdf ./scripts/install-asdf-plugins.sh",
           "ASDF_DIR=/asdf ./scripts/update-asdf-version-variables.sh"
         ],
         "fileFilters": [

scripts/update-asdf-version-variables.sh

@@ -5,43 +5,39 @@
 set -euo pipefail
 IFS=$'\n\t'
 
-ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
-asdf_current() {
-  asdf current 2>&1 || {
-    echo "# asdf current failed"
-    exit 1
-  }
-}
+cd "$(dirname "${BASH_SOURCE[0]}")/.."
 
 generate() {
-  asdf_current |
-    grep "${ROOT_DIR}/" |
+  sort .tool-versions |
     awk '
     BEGIN {
       print "# DO NOT MANUALLY EDIT; Run ./scripts/update-asdf-version-variables to update this";
       print "variables:"
     }
     {
-      gsub("-", "_", $1);
-      print "    GL_ASDF_" toupper($1) "_VERSION: " $2
+      if (!/^#/ && $1 != "" && $2 != "system") {
+        gsub("-", "_", $1);
+        print "    GL_ASDF_" toupper($1) "_VERSION: " $2
+      }
     }
     '
 }
 
 generate_defaults() {
-  asdf_current |
-    grep "${ROOT_DIR}/" |
+  sort .tool-versions |
     awk '
     BEGIN {
       print "# DO NOT MANUALLY EDIT; Run ./scripts/update-asdf-version-variables to update this";
       print "variables:"
     }
     {
-      gsub("-", "_", $1);
-      print "    GL_COMMON_CI_TASKS_DEFAULT_ASDF_" toupper($1) "_VERSION: " $2
+      if (!/^#/ && $1 != "" && $2 != "system") {
+        gsub("-", "_", $1);
+        print "    GL_COMMON_CI_TASKS_DEFAULT_ASDF_" toupper($1) "_VERSION: " $2
+      }
     }
     '
 }
 
-generate >"${ROOT_DIR}/.gitlab-ci-asdf-versions.yml"
-generate_defaults >"${ROOT_DIR}/.gitlab-ci-default-asdf-versions.yml"
+generate >".gitlab-ci-asdf-versions.yml"
+generate_defaults >".gitlab-ci-default-asdf-versions.yml"

semantic-release.md

@@ -38,6 +38,6 @@ include:
   # Analyze commits to determine whether to cut a release
   # see https://gitlab.com/gitlab-com/gl-infra/common-ci-tasks/-/blob/main/semantic-release.md
   - project: 'gitlab-com/gl-infra/common-ci-tasks'
-    ref: v1.24.1 # renovate:managed
+    ref: v1.25.0 # renovate:managed
     file: 'semantic-release.yml'
 ```

shellcheck.md

@@ -26,6 +26,6 @@ include:
   # standard canonical format
   # see https://gitlab.com/gitlab-com/gl-infra/common-ci-tasks/-/blob/main/shellcheck.md
   - project: 'gitlab-com/gl-infra/common-ci-tasks'
-    ref: v1.24.1 # renovate:managed
+    ref: v1.25.0 # renovate:managed
     file: shellcheck.yml
 ```

shfmt.md

@@ -22,6 +22,6 @@ include:
   # Ensure that all shell-scripts are formatted according to a
   # standard canonical format
   - project: 'gitlab-com/gl-infra/common-ci-tasks'
-    ref: v1.24.1 # renovate:managed
+    ref: v1.25.0 # renovate:managed
     file: shfmt.yml
 ```

templates/golang.md

@@ -26,6 +26,6 @@ include:
   # Runs golang standard tests, including tests, goreleaser, golangci-lint and go-mod-tidy
   # see https://gitlab.com/gitlab-com/gl-infra/common-ci-tasks/-/blob/main/README.md#templatesgolangyml
   - project: 'gitlab-com/gl-infra/common-ci-tasks'
-    ref: v1.24.1 # renovate:managed
+    ref: v1.25.0 # renovate:managed
     file: templates/golang.yml
 ```

templates/standard.md

@@ -25,6 +25,6 @@ include:
   # common to all projects using this template library.
   # see https://gitlab.com/gitlab-com/gl-infra/common-ci-tasks/-/blob/main/README.md#templatesstandardyml
   - project: 'gitlab-com/gl-infra/common-ci-tasks'
-    ref: v1.24.1 # renovate:managed
+    ref: v1.25.0 # renovate:managed
     file: templates/standard.yml
 ```

templates/terraform.md

@@ -25,6 +25,6 @@ include:
   # Runs Terraform validations, including tflint, terraform validate and terraform formatting checks
   # see https://gitlab.com/gitlab-com/gl-infra/common-ci-tasks/-/blob/main/README.md#templatesterraformyml
   - project: 'gitlab-com/gl-infra/common-ci-tasks'
-    ref: v1.24.1 # renovate:managed
+    ref: v1.25.0 # renovate:managed
     file: templates/terraform.yml
 ```

terraform-format.md

@@ -19,6 +19,6 @@ include:
   # Ensures that all terraform files are correctly formatted
   # see https://gitlab.com/gitlab-com/gl-infra/common-ci-tasks/-/blob/main/terraform-format.md
   - project: 'gitlab-com/gl-infra/common-ci-tasks'
-    ref: v1.24.1 # renovate:managed
+    ref: v1.25.0 # renovate:managed
     file: terraform-format.yml
 ```