diff options
| author | Max Wittig <max.wittig@siemens.com> | 2021-12-23 12:35:24 +0100 |
|---|---|---|
| committer | Max Wittig <max.wittig@siemens.com> | 2021-12-23 12:35:24 +0100 |
| commit | 1f15fbcfd6b411661d98f9a1fbefbc86b6d6ec9e (patch) | |
| tree | 50c2994ade8ed4c83e11480669ff15c458596d9b /pkgs/development/tools/continuous-integration | |
| parent | 56c2f8f1cc41244275911aceb43b9ca4d33b82ef (diff) | |
| download | nixpkgs-1f15fbcfd6b411661d98f9a1fbefbc86b6d6ec9e.tar nixpkgs-1f15fbcfd6b411661d98f9a1fbefbc86b6d6ec9e.tar.gz nixpkgs-1f15fbcfd6b411661d98f9a1fbefbc86b6d6ec9e.tar.bz2 nixpkgs-1f15fbcfd6b411661d98f9a1fbefbc86b6d6ec9e.tar.lz nixpkgs-1f15fbcfd6b411661d98f9a1fbefbc86b6d6ec9e.tar.xz nixpkgs-1f15fbcfd6b411661d98f9a1fbefbc86b6d6ec9e.tar.zst nixpkgs-1f15fbcfd6b411661d98f9a1fbefbc86b6d6ec9e.zip | |
gitlab-runner: 14.5.2 -> 14.6.0
Diffstat (limited to 'pkgs/development/tools/continuous-integration')
| -rw-r--r-- | pkgs/development/tools/continuous-integration/gitlab-runner/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/tools/continuous-integration/gitlab-runner/fix-shell-path.patch | 17 |
2 files changed, 9 insertions, 12 deletions
diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index d902b5f4c6a..a8456d09f98 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,7 +1,7 @@ { lib, buildGoPackage, fetchFromGitLab, fetchurl }: let - version = "14.5.2"; + version = "14.6.0"; in buildGoPackage rec { inherit version; @@ -19,7 +19,7 @@ buildGoPackage rec { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "07mr9w1rp3rnrlixmqziin1gw78s3gncg47b4z9h9zzpy3acy3xd"; + sha256 = "1sgz8gri51i2pxnzzkcvwx5ncw1rjz7ain82hlcx6f3874qfsniy"; }; patches = [ diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/fix-shell-path.patch b/pkgs/development/tools/continuous-integration/gitlab-runner/fix-shell-path.patch index 8aa419ea5f9..4a3d37be09c 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/fix-shell-path.patch +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/fix-shell-path.patch @@ -1,28 +1,25 @@ diff --git a/shells/bash.go b/shells/bash.go -index 673f4765..a58cc5e2 100644 +index bd99eca1a..9873dff6b 100644 --- a/shells/bash.go +++ b/shells/bash.go -@@ -5,6 +5,7 @@ import ( +@@ -3,6 +3,7 @@ package shells + import ( "bytes" "fmt" - "io" + "os/exec" "path" "runtime" "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 != "" { script.Command = "su" if runtime.GOOS == "linux" { - script.Arguments = append(script.Arguments, "-s", "/bin/"+b.Shell) + shellPath, err := exec.LookPath(b.Shell) + if err != nil { -+ shellPath = "/bin/"+b.Shell ++ shellPath = "/bin/" + b.Shell + } + script.Arguments = append(script.Arguments, "-s", shellPath) } - script.Arguments = append(script.Arguments, info.User) - script.Arguments = append(script.Arguments, "-c", shellCommand) --- -2.18.0 - + script.Arguments = append( + script.Arguments, |