Unverified Commit 132580d7 authored by Pascal Bach's avatar Pascal Bach Committed by GitHub
Browse files

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

gitlab-runner: 16.7.0 -> 16.9.1; unpin Go version
parents 481f4a7d 7a72ef21

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

+5 −4
Original line number Diff line number Diff line 
{ 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;

  };

pkgs/top-level/all-packages.nix

+1 −3
Original line number Diff line number Diff line
@@ -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 { };