Merge pull request #294783 from katexochen/gitlab-runner/update
gitlab-runner: 16.7.0 -> 16.9.1; unpin Go version
This commit is contained in:
commit
132580d70a
2 changed files with 6 additions and 7 deletions
|
@ -1,7 +1,7 @@
|
||||||
{ lib, buildGoModule, fetchFromGitLab, fetchurl, bash }:
|
{ lib, buildGoModule, fetchFromGitLab, fetchurl, bash }:
|
||||||
|
|
||||||
let
|
let
|
||||||
version = "16.7.0";
|
version = "16.9.1";
|
||||||
in
|
in
|
||||||
buildGoModule rec {
|
buildGoModule rec {
|
||||||
inherit version;
|
inherit version;
|
||||||
|
@ -17,13 +17,13 @@ buildGoModule rec {
|
||||||
# For patchShebangs
|
# For patchShebangs
|
||||||
buildInputs = [ bash ];
|
buildInputs = [ bash ];
|
||||||
|
|
||||||
vendorHash = "sha256-SHtxkB4qJMfhjo3UVjqBzD647AWIXIk10VtH/CMIB1I=";
|
vendorHash = "sha256-ErDwGjU6085/on5qazLME3stTLYhP8quHV/EoIZOO04=";
|
||||||
|
|
||||||
src = fetchFromGitLab {
|
src = fetchFromGitLab {
|
||||||
owner = "gitlab-org";
|
owner = "gitlab-org";
|
||||||
repo = "gitlab-runner";
|
repo = "gitlab-runner";
|
||||||
rev = "v${version}";
|
rev = "v${version}";
|
||||||
sha256 = "sha256-pVD3DCrujsrDJPt/DXelMYSK+u25aV2YUMDW+22QHwI=";
|
sha256 = "sha256-NEDqXgc0hbQc5BzyPuxddW+rvAWUz8KxnqSkzTDDu/I=";
|
||||||
};
|
};
|
||||||
|
|
||||||
patches = [
|
patches = [
|
||||||
|
@ -40,6 +40,7 @@ buildGoModule rec {
|
||||||
|
|
||||||
# No writable developer environment
|
# No writable developer environment
|
||||||
rm common/build_test.go
|
rm common/build_test.go
|
||||||
|
rm common/build_settings_test.go
|
||||||
rm executors/custom/custom_test.go
|
rm executors/custom/custom_test.go
|
||||||
|
|
||||||
# No docker during build
|
# No docker during build
|
||||||
|
@ -67,7 +68,7 @@ buildGoModule rec {
|
||||||
meta = with lib; {
|
meta = with lib; {
|
||||||
description = "GitLab Runner the continuous integration executor of GitLab";
|
description = "GitLab Runner the continuous integration executor of GitLab";
|
||||||
license = licenses.mit;
|
license = licenses.mit;
|
||||||
homepage = "https://about.gitlab.com/gitlab-ci/";
|
homepage = "https://docs.gitlab.com/runner/";
|
||||||
platforms = platforms.unix ++ platforms.darwin;
|
platforms = platforms.unix ++ platforms.darwin;
|
||||||
maintainers = with maintainers; [ bachp zimbatm ] ++ teams.gitlab.members;
|
maintainers = with maintainers; [ bachp zimbatm ] ++ teams.gitlab.members;
|
||||||
};
|
};
|
||||||
|
|
|
@ -8498,9 +8498,7 @@ with pkgs;
|
||||||
|
|
||||||
gitlab-pages = callPackage ../applications/version-management/gitlab/gitlab-pages { };
|
gitlab-pages = callPackage ../applications/version-management/gitlab/gitlab-pages { };
|
||||||
|
|
||||||
gitlab-runner = callPackage ../development/tools/continuous-integration/gitlab-runner {
|
gitlab-runner = callPackage ../development/tools/continuous-integration/gitlab-runner { };
|
||||||
buildGoModule = buildGo120Module;
|
|
||||||
};
|
|
||||||
|
|
||||||
gitlab-shell = callPackage ../applications/version-management/gitlab/gitlab-shell { };
|
gitlab-shell = callPackage ../applications/version-management/gitlab/gitlab-shell { };
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue