gitlab-runner: circumvent patched go runtime check
We already have a go version with the proper fix.
This commit is contained in:
parent
88453a08f9
commit
bc5fcddcd7
2 changed files with 34 additions and 1 deletions
|
@ -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
|
||||
|
|
@ -22,7 +22,10 @@ buildGoPackage rec {
|
|||
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";
|
||||
|
|
Loading…
Reference in a new issue