···

       
1
       
 
       
{ lib, buildGoModule, fetchFromGitLab, fetchurl, bash }:

     

       
2
       
 
       


     

       
3
       
 
       
let

     

       
4
       
-
       
  version = "15.5.1";

     

       
5
       
 
       
in

     

       
6
       
 
       
buildGoModule rec {

     

       
7
       
 
       
  inherit version;

     
···

       
17
       
 
       
  # For patchShebangs

     

       
18
       
 
       
  buildInputs = [ bash ];

     

       
19
       
 
       


     

       
20
       
-
       
  vendorSha256 = "sha256-IcsYH1V3b5IUY2JqOADJrc4lkng1GS7lndfHObRQbxU=";

     

       
21
       
 
       


     

       
22
       
 
       
  src = fetchFromGitLab {

     

       
23
       
 
       
    owner = "gitlab-org";

     

       
24
       
 
       
    repo = "gitlab-runner";

     

       
25
       
 
       
    rev = "v${version}";

     

       
26
       
-
       
    sha256 = "sha256-ZvQaA4DSuEIdHEoRKJg5tOnBQgf26paTAiWy6RLRG3o=";

     

       
27
       
 
       
  };

     

       
28
       
 
       


     

       
29
       
 
       
  patches = [

     
···

       
46
       
 
       
    rm executors/docker/terminal_test.go

     

       
47
       
 
       
    rm executors/docker/docker_test.go

     

       
48
       
 
       
    rm helpers/docker/auth/auth_test.go

     

       
0
       
 
       

     

       
49
       
 
       
  '';

     

       
50
       
 
       


     

       
51
       
 
       
  postInstall = ''

     

···

       
1
       
 
       
{ lib, buildGoModule, fetchFromGitLab, fetchurl, bash }:

     

       
2
       
 
       


     

       
3
       
 
       
let

     

       
4
       
+
       
  version = "15.7.1";

     

       
5
       
 
       
in

     

       
6
       
 
       
buildGoModule rec {

     

       
7
       
 
       
  inherit version;

     
···

       
17
       
 
       
  # For patchShebangs

     

       
18
       
 
       
  buildInputs = [ bash ];

     

       
19
       
 
       


     

       
20
       
+
       
  vendorSha256 = "sha256-GyhDns10eekU05D7SGbhYYlpK3OIajtUXXOcWgprBPc=";

     

       
21
       
 
       


     

       
22
       
 
       
  src = fetchFromGitLab {

     

       
23
       
 
       
    owner = "gitlab-org";

     

       
24
       
 
       
    repo = "gitlab-runner";

     

       
25
       
 
       
    rev = "v${version}";

     

       
26
       
+
       
    sha256 = "sha256-YHqezwud+/osCiqeR3QUvANFRU/oR451act+Crh4CRE=";

     

       
27
       
 
       
  };

     

       
28
       
 
       


     

       
29
       
 
       
  patches = [

     
···

       
46
       
 
       
    rm executors/docker/terminal_test.go

     

       
47
       
 
       
    rm executors/docker/docker_test.go

     

       
48
       
 
       
    rm helpers/docker/auth/auth_test.go

     

       
49
       
+
       
    rm executors/docker/services_test.go

     

       
50
       
 
       
  '';

     

       
51
       
 
       


     

       
52
       
 
       
  postInstall = ''

     

···

       
1
       
 
       
diff --git a/shells/bash_test.go b/shells/bash_test.go

     

       
2
       
-
       
index b8a48f85e..0e3173fc3 100644

     

       
3
       
 
       
--- a/shells/bash_test.go

     

       
4
       
 
       
+++ b/shells/bash_test.go

     

       
5
       
-
       
@@ -4,12 +4,9 @@

     

       
6
       
-
       
 package shells

     

       
7
       
 
       
 

     

       
8
       
 
       
 import (

     

       
0
       
 
       

     

       
9
       
 
       
-	"runtime"

     

       
10
       
 
       
 	"testing"

     

       
11
       
 
       
 

     

       
12
       
 
       
 	"github.com/stretchr/testify/assert"

     

       
13
       
 
       
-	"github.com/stretchr/testify/require"

     

       
14
       
-
       
-	"gitlab.com/gitlab-org/gitlab-runner/common"

     

       
15
       
 
       
 )

     

       
16
       
 
       
 

     

       
17
       
-
       
 func TestBash_CommandShellEscapesLegacy(t *testing.T) {

     

       
18
       
-
       
@@ -84,62 +81,3 @@ func TestBash_CheckForErrors(t *testing.T) {

     

       
19
       
-
       
 		})

     

       
20
       
 
       
 	}

     

       
21
       
 
       
 }

     

       
22
       
-
       
-

     

       
23
       
 
       
-func TestBash_GetConfiguration(t *testing.T) {

     

       
24
       
 
       
-	tests := map[string]struct {

     

       
25
       
 
       
-		info common.ShellScriptInfo

     
···

       
78
       
 
       
-		})

     

       
79
       
 
       
-	}

     

       
80
       
 
       
-}

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

       
0
       
 
       

     

···

       
1
       
 
       
diff --git a/shells/bash_test.go b/shells/bash_test.go

     

       
2
       
+
       
index 9ed9e65ff..02b6e6d5f 100644

     

       
3
       
 
       
--- a/shells/bash_test.go

     

       
4
       
 
       
+++ b/shells/bash_test.go

     

       
5
       
+
       
@@ -4,11 +4,9 @@ package shells

     

       
0
       
 
       

     

       
6
       
 
       
 

     

       
7
       
 
       
 import (

     

       
8
       
+
       
 	"path"

     

       
9
       
 
       
-	"runtime"

     

       
10
       
 
       
 	"testing"

     

       
11
       
 
       
 

     

       
12
       
 
       
 	"github.com/stretchr/testify/assert"

     

       
13
       
 
       
-	"github.com/stretchr/testify/require"

     

       
14
       
+
       
 	"gitlab.com/gitlab-org/gitlab-runner/common"

     

       
15
       
 
       
 )

     

       
16
       
 
       
 

     

       
17
       
+
       
@@ -90,65 +88,6 @@ func TestBash_CheckForErrors(t *testing.T) {

     

       
0
       
 
       

     

       
0
       
 
       

     

       
18
       
 
       
 	}

     

       
19
       
 
       
 }

     

       
20
       
+
       
 

     

       
21
       
 
       
-func TestBash_GetConfiguration(t *testing.T) {

     

       
22
       
 
       
-	tests := map[string]struct {

     

       
23
       
 
       
-		info common.ShellScriptInfo

     
···

       
76
       
 
       
-		})

     

       
77
       
 
       
-	}

     

       
78
       
 
       
-}

     

       
79
       
+
       
-

     

       
80
       
+
       
 func Test_BashWriter_isTmpFile(t *testing.T) {

     

       
81
       
+
       
 	tmpDir := "/foo/bar"

     

       
82
       
+
       
 	bw := BashWriter{TemporaryPath: tmpDir}