diff options
| author | Robin Gloster <mail@glob.in> | 2023-06-25 21:03:37 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-25 21:03:37 +0200 |
| commit | 5adc861ad9a86f635d9d1fca49d0da6c050b3ffc (patch) | |
| tree | 5538c65329c5d394dee3c969bfd69f21bfee1c9f | |
| parent | Merge pull request #239718 from NixOS/backport-239559-to-release-23.05 (diff) | |
| parent | gitlab-runner: 16.0.2 -> 16.1.0 (diff) | |
| download | nixpkgs-5adc861ad9a86f635d9d1fca49d0da6c050b3ffc.tar.gz | |
Merge pull request #239782 from NixOS/backport-239145-to-release-23.05
[Backport release-23.05] gitlab-runner: 16.0.2 -> 16.1.0
| -rw-r--r-- | pkgs/development/tools/continuous-integration/gitlab-runner/default.nix | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index 7f6dd71c14c7..65cf727997dc 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,7 +1,7 @@ { lib, buildGoModule, fetchFromGitLab, fetchurl, bash }: let - version = "16.0.2"; + version = "16.1.0"; in buildGoModule rec { inherit version; @@ -17,13 +17,13 @@ buildGoModule rec { # For patchShebangs buildInputs = [ bash ]; - vendorHash = "sha256-BgT+anRMkF00LLi+7Em0pXElwBnPz3QTs0G5+yoEj/k="; + vendorHash = "sha256-tlTmKq1a5hX8G0+7RC1QbWA7YVnoBS5R9QqXljJ4bVg="; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "sha256-t1DI7AhxnnBoP5h54dUCKtJcIffxmv0c7OczVhEy3rI="; + sha256 = "sha256-1obA2f/YtOBkgYLJqcHQWbaCezEw7lUXs4OxFiONCm8="; }; patches = [ @@ -49,6 +49,12 @@ buildGoModule rec { rm executors/docker/services_test.go ''; + excludedPackages = [ + # CI helper script for pushing images to Docker and ECR registries + # https://gitlab.com/gitlab-org/gitlab-runner/-/merge_requests/4139 + "./scripts/sync-docker-images" + ]; + postInstall = '' install packaging/root/usr/share/gitlab-runner/clear-docker-cache $out/bin ''; |