JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #294783 from katexochen/gitlab-runner/update

Browse Source 
gitlab-runner: 16.7.0 -> 16.9.1; unpin Go version
This commit is contained in:
Pascal Bach 2024-03-10 22:42:16 +01:00 committed by GitHub
commit 132580d70a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
View File

@ -1,7 +1,7 @@
{ lib, buildGoModule, fetchFromGitLab, fetchurl, bash }:
let
version = "16.7.0";
version = "16.9.1";
in
buildGoModule rec {
inherit version;
@ -17,13 +17,13 @@ buildGoModule rec {
# For patchShebangs
buildInputs = [ bash ];
vendorHash = "sha256-SHtxkB4qJMfhjo3UVjqBzD647AWIXIk10VtH/CMIB1I=";
vendorHash = "sha256-ErDwGjU6085/on5qazLME3stTLYhP8quHV/EoIZOO04=";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-runner";
rev = "v${version}";
sha256 = "sha256-pVD3DCrujsrDJPt/DXelMYSK+u25aV2YUMDW+22QHwI=";
sha256 = "sha256-NEDqXgc0hbQc5BzyPuxddW+rvAWUz8KxnqSkzTDDu/I=";
};
patches = [
@ -40,6 +40,7 @@ buildGoModule rec {
# No writable developer environment
rm common/build_test.go
rm common/build_settings_test.go
rm executors/custom/custom_test.go
# No docker during build
@ -67,7 +68,7 @@ buildGoModule rec {
meta = with lib; {
description = "GitLab Runner the continuous integration executor of GitLab";
license = licenses.mit;
homepage = "https://about.gitlab.com/gitlab-ci/";
homepage = "https://docs.gitlab.com/runner/";
platforms = platforms.unix ++ platforms.darwin;
maintainers = with maintainers; [ bachp zimbatm ] ++ teams.gitlab.members;
};

4
pkgs/top-level/all-packages.nix
View File

@ -8498,9 +8498,7 @@ with pkgs;
gitlab-pages = callPackage ../applications/version-management/gitlab/gitlab-pages { };
gitlab-runner = callPackage ../development/tools/continuous-integration/gitlab-runner {
buildGoModule = buildGo120Module;
};
gitlab-runner = callPackage ../development/tools/continuous-integration/gitlab-runner { };
gitlab-shell = callPackage ../applications/version-management/gitlab/gitlab-shell { };