From 4bc6632241cd0487b22349344dcea4c25647ef7d Mon Sep 17 00:00:00 2001 From: wolfi-bot <121097084+wolfi-bot@users.noreply.github.com> Date: Mon, 5 May 2025 11:54:40 +0000 Subject: [PATCH 1/2] gitlab-runner-17.11/17.11.1 package update Signed-off-by: wolfi-bot <121097084+wolfi-bot@users.noreply.github.com> --- gitlab-runner-17.11.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gitlab-runner-17.11.yaml b/gitlab-runner-17.11.yaml index b1c877a7e2a..8ec6cd38c43 100644 --- a/gitlab-runner-17.11.yaml +++ b/gitlab-runner-17.11.yaml @@ -15,8 +15,8 @@ var-transforms: package: name: gitlab-runner-17.11 # ---Additional updates required--- Review 'vars' section (above), when reviewing version bumps. - version: "17.11.0" - epoch: 1 + version: "17.11.1" + 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: - license: MIT @@ -29,7 +29,7 @@ pipeline: with: repository: https://gitlab.com/gitlab-org/gitlab-runner tag: v${{package.version}} - expected-commit: 0f67ff190a5f069ef1e46f2a8950e1319e71d6e4 + expected-commit: 96856197176687bb5744a7562cc65130b32d4005 - 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: 96856197176687bb5744a7562cc65130b32d4005 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: 96856197176687bb5744a7562cc65130b32d4005 destination: ./machine - uses: go/bump From 7ae06753e7cdcab7606fda018fe8727358fd6b74 Mon Sep 17 00:00:00 2001 From: Amber Arcadia Date: Mon, 5 May 2025 12:54:59 -0400 Subject: [PATCH 2/2] Revert CI clobbering commit variables --- gitlab-runner-17.11.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gitlab-runner-17.11.yaml b/gitlab-runner-17.11.yaml index 8ec6cd38c43..46ad2526267 100644 --- a/gitlab-runner-17.11.yaml +++ b/gitlab-runner-17.11.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: 96856197176687bb5744a7562cc65130b32d4005 + 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: 96856197176687bb5744a7562cc65130b32d4005 + expected-commit: ${{vars.docker-machine-commit}} destination: ./machine - uses: go/bump