Unverified Commit a0f9c8c8 authored by Leona Maroni's avatar Leona Maroni Committed by GitHub
Browse files

[Backport release-25.11] Revert "gitlab-runner: 18.5.0 -> 18.6.0" (#465383)

parents dcab162b 292a6268
Loading
Loading
Loading
Loading
+3 −10
Original line number Diff line number Diff line
@@ -4,23 +4,22 @@
  bash,
  buildGoModule,
  fetchFromGitLab,
  fetchpatch,
  nix-update-script,
  versionCheckHook,
}:

buildGoModule (finalAttrs: {
  pname = "gitlab-runner";
  version = "18.6.0";
  version = "18.5.0";

  src = fetchFromGitLab {
    owner = "gitlab-org";
    repo = "gitlab-runner";
    tag = "v${finalAttrs.version}";
    hash = "sha256-SpfmFpL4bZbzC3T77EEbOoV9dVY3tLgcuE0gN4x1168=";
    hash = "sha256-xuRYnK5Ev2M/vrVWMHcTcK7LLwlQ30MVadMjA67fHpY=";
  };

  vendorHash = "sha256-9Ttmf/iTikSAlAIlmKSRMEDizPP4Iw0CttcR8oYLiMU=";
  vendorHash = "sha256-5Gh9jQ4GkvtN8inEUphehbsnmfyQldvxjbxBkXQ63wc=";

  # For patchShebangs
  buildInputs = [ bash ];
@@ -28,12 +27,6 @@ buildGoModule (finalAttrs: {
  patches = [
    ./fix-shell-path.patch
    ./remove-bash-test.patch
    # fix regression. remove with next release.
    (fetchpatch {
      name = "fix-shell-executor-not-working-with-variables-that-use-file-variables.patch";
      url = "https://gitlab.com/gitlab-org/gitlab-runner/-/commit/6318fe8e38ca9774eb0f52fa2c68555cdad3ab44.patch";
      hash = "sha256-GTdBo+7kHHpNs6JywjOII4NBcHjFYEZ3xhdGTcGKov4=";
    })
  ];

  prePatch = ''