From 8224647827fc8af5a394a20a5bce8277515fc21c Mon Sep 17 00:00:00 2001 From: "octo-sts[bot]" <157150467+octo-sts@users.noreply.github.com> Date: Tue, 26 Nov 2024 22:40:21 +0000 Subject: [PATCH 1/3] gitlab-runner-17.6: updated --- gitlab-runner-17.6.yaml | 137 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 137 insertions(+) create mode 100644 gitlab-runner-17.6.yaml diff --git a/gitlab-runner-17.6.yaml b/gitlab-runner-17.6.yaml new file mode 100644 index 00000000000..287abfd9450 --- /dev/null +++ b/gitlab-runner-17.6.yaml @@ -0,0 +1,137 @@ +# This tracks and the expected commit and tag used by Docker Machine. +# This varies for each version of GitLab's runner and requires manual +# intervention between updates. +# +# Please ensure the expected commit and tag match the version of Docker +# Machine defined here: +# - https://gitlab.com/gitlab-org/gitlab-runner/-/blob/v/.gitlab/ci/_common.gitlab-ci.yml +# If you need to get the associated Git SHA for the new tag: +# - https://gitlab.com/gitlab-org/ci-cd/docker-machine/-/tags +vars: + machine-commit: 4976538e17385c8e4681641c8ac9c27a1963c860 + machine-tag: 0.16.2-gitlab.29 + +var-transforms: + - from: ${{package.version}} + match: ^(\d+\.\d+)\.\d+$ + replace: "$1" + to: major-minor-version + +package: + name: gitlab-runner-17.6 + # ---Additional updates required--- Review 'vars' section (above), when reviewing version bumps. + version: 17.6.0 + 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 + dependencies: + provides: + - gitlab-runner=${{package.full-version}} + +pipeline: + - uses: git-checkout + with: + repository: https://gitlab.com/gitlab-org/gitlab-runner + tag: v${{package.version}} + expected-commit: 12030cf4e1c6c9f8bc5a1e6eb515d7884e20f5c4 + + - uses: go/build + with: + packages: . + output: gitlab-runner + ldflags: -w -X gitlab.com/gitlab-org/gitlab-runner/common.NAME=${{package.name}} -X gitlab.com/gitlab-org/gitlab-runner/common.VERSION=v${{package.version}} + +subpackages: + - name: gitlab-runner-helper-${{vars.major-minor-version}} + description: GitLab Runner Helper + dependencies: + provides: + - gitlab-runner-helper=${{package.full-version}} + pipeline: + - uses: go/build + with: + packages: ./apps/gitlab-runner-helper + output: gitlab-runner-helper + ldflags: -w -X gitlab.com/gitlab-org/gitlab-runner/common.NAME=${{package.name}} -X gitlab.com/gitlab-org/gitlab-runner/common.VERSION=v${{package.version}} + + - name: "gitlab-runner-oci-entrypoint-${{vars.major-minor-version}}" + description: "Gitlab-runner oci entrypoint" + dependencies: + provides: + - gitlab-runner-oci-entrypoint=${{package.full-version}} + pipeline: + - runs: | + mkdir -p "${{targets.subpkgdir}}" + cp dockerfiles/runner/alpine/entrypoint "${{targets.subpkgdir}}"/entrypoint + chmod 755 "${{targets.subpkgdir}}"/entrypoint + + - name: "gitlab-runner-helper-oci-entrypoint-${{vars.major-minor-version}}" + description: "Gitlab-runner-helper oci entrypoint" + dependencies: + provides: + - gitlab-runner-helper-oci-entrypoint=${{package.full-version}} + pipeline: + - runs: | + mkdir -p "${{targets.subpkgdir}}"/usr/bin + cp dockerfiles/runner-helper/scripts/gitlab-runner-build "${{targets.subpkgdir}}"/usr/bin/gitlab-runner-build + cp dockerfiles/runner-helper/helpers/entrypoint "${{targets.subpkgdir}}"/entrypoint + + - name: "gitlab-runner-helper-compat-${{vars.major-minor-version}}" + description: "Gitlab-runner-helper compat" + dependencies: + provides: + - gitlab-runner-helper-compat=${{package.full-version}} + pipeline: + - runs: | + mkdir -p "${{targets.subpkgdir}}"/usr/bin + ln -sf /usr/bin/gitlab-runner "${{targets.subpkgdir}}"/usr/bin/gitlab-ci-multi-runner + ln -sf /usr/bin/miniperl "${{targets.subpkgdir}}"/usr/bin/perl + + - name: gitlab-docker-machine-${{vars.major-minor-version}} + description: "Creates Docker hosts used by GitLab runner." + dependencies: + provides: + - gitlab-docker-machine=${{package.full-version}} + pipeline: + - uses: git-checkout + with: + repository: https://gitlab.com/gitlab-org/ci-cd/docker-machine + tag: v${{vars.machine-tag}} + expected-commit: ${{vars.machine-commit}} + destination: ./machine + - uses: go/bump + with: + deps: github.com/golang-jwt/jwt/v4@v4.5.1 + modroot: ./machine + - uses: go/build + with: + packages: ./cmd/docker-machine + output: docker-machine + ldflags: -w -X github.com/docker/machine/version.GitCommit=$(git rev-parse --short HEAD 2>/dev/null) + modroot: ./machine + test: + pipeline: + - runs: | + docker-machine -v | grep ${{vars.machine-tag}} + docker-machine -h + +update: + enabled: true + # Requires manual steps when updating + manual: true + git: + strip-prefix: v + tag-filter-prefix: v17.6 + +test: + environment: + contents: + packages: + - gitlab-runner-helper-compat-${{vars.major-minor-version}} + - gitlab-runner-helper=${{package.full-version}} + pipeline: + - runs: | + gitlab-runner --help + gitlab-runner-helper --help + gitlab-runner --version From 1cd0ae789f14db7ebead1c3fce4c9149b55a276c Mon Sep 17 00:00:00 2001 From: "octo-sts[bot]" <157150467+octo-sts@users.noreply.github.com> Date: Tue, 26 Nov 2024 22:40:23 +0000 Subject: [PATCH 2/3] gitlab-runner-17.6: updated patch directory From 45271743a6e5dc8deb92874f06ed342893f39575 Mon Sep 17 00:00:00 2001 From: Hunter Harris Date: Mon, 9 Dec 2024 16:52:04 -0500 Subject: [PATCH 3/3] Fixed expected commit --- gitlab-runner-17.6.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitlab-runner-17.6.yaml b/gitlab-runner-17.6.yaml index 287abfd9450..136aa9bc0c1 100644 --- a/gitlab-runner-17.6.yaml +++ b/gitlab-runner-17.6.yaml @@ -34,7 +34,7 @@ pipeline: with: repository: https://gitlab.com/gitlab-org/gitlab-runner tag: v${{package.version}} - expected-commit: 12030cf4e1c6c9f8bc5a1e6eb515d7884e20f5c4 + expected-commit: 374d34fda25904c34e29770b2027cef3c2cebc21 - uses: go/build with: