Skip to content

Commit

Permalink
Merge pull request #150201 from yayayayaka/gitlab-runner-14.5.2
Browse files Browse the repository at this point in the history
gitlab-runner: 14.5.0 -> 14.5.2
  • Loading branch information
bachp authored Dec 13, 2021
2 parents 32e3ee5 + bc5fcdd commit 1a551cf
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 3 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
From 13c633bf0075daa6ff973f368a25cf205caa017e Mon Sep 17 00:00:00 2001
From: Pascal Bach <pascal.bach@nextrem.ch>
Date: Sat, 11 Dec 2021 10:07:01 +0100
Subject: [PATCH] gitlab-runner: don't checked for fixed runtime

We already use 1.16.12 which has the proper fix
---
helpers/patches/issue_28732/syscall.go | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/helpers/patches/issue_28732/syscall.go b/helpers/patches/issue_28732/syscall.go
index 580513b57..fa9e4cc85 100644
--- a/helpers/patches/issue_28732/syscall.go
+++ b/helpers/patches/issue_28732/syscall.go
@@ -2,11 +2,6 @@

package issue_28732

-import (
- "syscall"
-)
-
func AssertFixPresent() {
- // Ensure that Issue28732Fix fixed runtime is used
- syscall.Issue28732Fix()
+ // Issue already fixed by using go 1.16.12
}
--
2.34.0

Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{ lib, buildGoPackage, fetchFromGitLab, fetchurl }:

let
version = "14.5.0";
version = "14.5.2";
in
buildGoPackage rec {
inherit version;
Expand All @@ -19,10 +19,13 @@ buildGoPackage rec {
owner = "gitlab-org";
repo = "gitlab-runner";
rev = "v${version}";
sha256 = "sha256-BxnIrjiEW61J6hl7mWNXc2Vb4ae1cWqOypTy9Xo7Hkc=";
sha256 = "07mr9w1rp3rnrlixmqziin1gw78s3gncg47b4z9h9zzpy3acy3xd";
};

patches = [ ./fix-shell-path.patch ];
patches = [
./fix-shell-path.patch
./0001-gitlab-runner-don-t-checked-for-fixed-runtime.patch
];

meta = with lib; {
description = "GitLab Runner the continuous integration executor of GitLab";
Expand Down

0 comments on commit 1a551cf

Please sign in to comment.