gitlab-runner-v1: remove v1 package (#47624)

It was required for gitlab < 9 which is not supported anymore since some time.

While removinf the V1 the patch was refreshed to cleanly work with version 11.x
This commit is contained in:
Pascal Bach
2018-10-01 23:37:25 +02:00
committed by xeji
parent a3d86b49b4
commit 9dbb71b1d3
3 changed files with 9 additions and 75 deletions

View File

@@ -1,16 +1,16 @@
diff --git a/shells/bash.go b/shells/bash.go
index 839b7781..2b478e1e 100644
index 673f4765..a58cc5e2 100644
--- a/shells/bash.go
+++ b/shells/bash.go
@@ -7,6 +7,7 @@ import (
"gitlab.com/gitlab-org/gitlab-ci-multi-runner/common"
"gitlab.com/gitlab-org/gitlab-ci-multi-runner/helpers"
@@ -5,6 +5,7 @@ import (
"bytes"
"fmt"
"io"
+ "os/exec"
"path"
"runtime"
"strconv"
@@ -208,7 +209,11 @@ func (b *BashShell) GetConfiguration(info common.ShellScriptInfo) (script *commo
@@ -225,7 +226,11 @@ func (b *BashShell) GetConfiguration(info common.ShellScriptInfo) (script *commo
if info.User != "" {
script.Command = "su"
if runtime.GOOS == "linux" {
@@ -22,4 +22,7 @@ index 839b7781..2b478e1e 100644
+ script.Arguments = append(script.Arguments, "-s", shellPath)
}
script.Arguments = append(script.Arguments, info.User)
script.Arguments = append(script.Arguments, "-c", shellCommand)
script.Arguments = append(script.Arguments, "-c", shellCommand)
--
2.18.0