From 5bdcd3f5dd4871a247551cbc79c7b8d284c75ec2 Mon Sep 17 00:00:00 2001 From: wolfi-bot <121097084+wolfi-bot@users.noreply.github.com> Date: Wed, 11 Jun 2025 18:54:44 +0000 Subject: [PATCH 1/2] gitlab-runner-18.0/18.0.3 package update Signed-off-by: wolfi-bot <121097084+wolfi-bot@users.noreply.github.com> --- gitlab-runner-18.0.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gitlab-runner-18.0.yaml b/gitlab-runner-18.0.yaml index 7d6dbc17abd..73ebea01522 100644 --- a/gitlab-runner-18.0.yaml +++ b/gitlab-runner-18.0.yaml @@ -15,7 +15,7 @@ var-transforms: package: name: gitlab-runner-18.0 # ---Additional updates required--- Review 'vars' section (above), when reviewing version bumps. - version: "18.0.2" + version: "18.0.3" epoch: 0 description: GitLab Runner is the open source project that is used to run your CI/CD jobs and send the results back to GitLab copyright: @@ -29,7 +29,7 @@ pipeline: with: repository: https://gitlab.com/gitlab-org/gitlab-runner tag: v${{package.version}} - expected-commit: 4d7093e1e4eb37e77441dc0f9c83e0af7a9d4180 + expected-commit: 4e717029caf97ec9d98fb87cfa7cee462ac0f81c - name: Verify base-images-tag matches the expected upstream value runs: | @@ -51,7 +51,7 @@ pipeline: with: repository: https://gitlab.com/gitlab-org/ci-cd/runner-tools/base-images tag: v${{vars.base-images-tag}} - expected-commit: ${{vars.base-images-commit}} + expected-commit: 4e717029caf97ec9d98fb87cfa7cee462ac0f81c destination: ./base-images - name: Verify docker-machine-tag matches the expected value @@ -72,7 +72,7 @@ pipeline: with: repository: https://gitlab.com/gitlab-org/ci-cd/docker-machine tag: ${{vars.docker-machine-tag}} - expected-commit: ${{vars.docker-machine-commit}} + expected-commit: 4e717029caf97ec9d98fb87cfa7cee462ac0f81c destination: ./machine - uses: go/bump From a15bd6d28b2e5a96fd736af0edb89116c110dee8 Mon Sep 17 00:00:00 2001 From: Amber Arcadia Date: Wed, 11 Jun 2025 18:37:26 -0400 Subject: [PATCH 2/2] Revert CI variable clobbering --- gitlab-runner-18.0.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitlab-runner-18.0.yaml b/gitlab-runner-18.0.yaml index 73ebea01522..b3dfd0b5de3 100644 --- a/gitlab-runner-18.0.yaml +++ b/gitlab-runner-18.0.yaml @@ -51,7 +51,7 @@ pipeline: with: repository: https://gitlab.com/gitlab-org/ci-cd/runner-tools/base-images tag: v${{vars.base-images-tag}} - expected-commit: 4e717029caf97ec9d98fb87cfa7cee462ac0f81c + expected-commit: ${{vars.base-images-commit}} destination: ./base-images - name: Verify docker-machine-tag matches the expected value @@ -72,7 +72,7 @@ pipeline: with: repository: https://gitlab.com/gitlab-org/ci-cd/docker-machine tag: ${{vars.docker-machine-tag}} - expected-commit: 4e717029caf97ec9d98fb87cfa7cee462ac0f81c + expected-commit: ${{vars.docker-machine-commit}} destination: ./machine - uses: go/bump