alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Merge pull request #151881 from max-wittig/gitlab-runner-14-6-0

Browse source 
gitlab-runner: 14.5.2 -> 14.6.0
This commit is contained in:
Jonas Chevalier 2021-12-23 14:20:07 +01:00 committed by GitHub
parent a4a7a0b5e0 1f15fbcfd6
commit 8b3fbab072
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,7 +1,7 @@
{ lib, buildGoPackage, fetchFromGitLab, fetchurl }: { lib, buildGoPackage, fetchFromGitLab, fetchurl }:
let let
version = "14.5.2"; version = "14.6.0";
in in
buildGoPackage rec { buildGoPackage rec {
inherit version; inherit version;
@ -19,7 +19,7 @@ buildGoPackage rec {
owner = "gitlab-org"; owner = "gitlab-org";
repo = "gitlab-runner"; repo = "gitlab-runner";
rev = "v${version}"; rev = "v${version}";
sha256 = "07mr9w1rp3rnrlixmqziin1gw78s3gncg47b4z9h9zzpy3acy3xd"; sha256 = "1sgz8gri51i2pxnzzkcvwx5ncw1rjz7ain82hlcx6f3874qfsniy";
}; };
patches = [ patches = [

17
pkgs/development/tools/continuous-integration/gitlab-runner/fix-shell-path.patch
View file

@ -1,28 +1,25 @@
diff --git a/shells/bash.go b/shells/bash.go diff --git a/shells/bash.go b/shells/bash.go
index 673f4765..a58cc5e2 100644 index bd99eca1a..9873dff6b 100644
--- a/shells/bash.go --- a/shells/bash.go
+++ b/shells/bash.go +++ b/shells/bash.go
@@ -5,6 +5,7 @@ import ( @@ -3,6 +3,7 @@ package shells
import (
"bytes" "bytes"
"fmt" "fmt"
"io"
+ "os/exec" + "os/exec"
"path" "path"
"runtime" "runtime"
"strconv" "strconv"
@@ -225,7 +226,11 @@ func (b *BashShell) GetConfiguration(info common.ShellScriptInfo) (script *commo @@ -300,7 +301,11 @@ func (b *BashShell) GetConfiguration(info common.ShellScriptInfo) (*common.Shell
if info.User != "" { if info.User != "" {
script.Command = "su" script.Command = "su"
if runtime.GOOS == "linux" { if runtime.GOOS == "linux" {
- script.Arguments = append(script.Arguments, "-s", "/bin/"+b.Shell) - script.Arguments = append(script.Arguments, "-s", "/bin/"+b.Shell)
+ shellPath, err := exec.LookPath(b.Shell) + shellPath, err := exec.LookPath(b.Shell)
+ if err != nil { + if err != nil {
+ shellPath = "/bin/"+b.Shell + shellPath = "/bin/" + b.Shell
+ } + }
+ script.Arguments = append(script.Arguments, "-s", shellPath) + script.Arguments = append(script.Arguments, "-s", shellPath)
} }
script.Arguments = append(script.Arguments, info.User) script.Arguments = append(
script.Arguments = append(script.Arguments, "-c", shellCommand) script.Arguments,
--
2.18.0