commit 6052729bba8cc0b3139b18c5ef87fd78ebb6cb8f · pyrox.dev/nixpkgs

+4 -3

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

···

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

     

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
       -
         version = "15.5.1";

     

       4
       4
       +
         version = "15.7.1";

     

       5
       5
        
       in

     

       6
       6
        
       buildGoModule rec {

     

       7
       7
        
         inherit version;

     
···

       17
       17
        
         # For patchShebangs

     

       18
       18
        
         buildInputs = [ bash ];

     

       19
       19
        
       

     

       20
       20
       -
         vendorSha256 = "sha256-IcsYH1V3b5IUY2JqOADJrc4lkng1GS7lndfHObRQbxU=";

     

       20
       20
       +
         vendorSha256 = "sha256-GyhDns10eekU05D7SGbhYYlpK3OIajtUXXOcWgprBPc=";

     

       21
       21
        
       

     

       22
       22
        
         src = fetchFromGitLab {

     

       23
       23
        
           owner = "gitlab-org";

     

       24
       24
        
           repo = "gitlab-runner";

     

       25
       25
        
           rev = "v${version}";

     

       26
       26
       -
           sha256 = "sha256-ZvQaA4DSuEIdHEoRKJg5tOnBQgf26paTAiWy6RLRG3o=";

     

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

     

       27
       27
        
         };

     

       28
       28
        
       

     

       29
       29
        
         patches = [

     
···

       46
       46
        
           rm executors/docker/terminal_test.go

     

       47
       47
        
           rm executors/docker/docker_test.go

     

       48
       48
        
           rm helpers/docker/auth/auth_test.go

     

       49
       49
       +
           rm executors/docker/services_test.go

     

       49
       50
        
         '';

     

       50
       51
        
       

     

       51
       52
        
         postInstall = ''

+10 -8

pkgs/development/tools/continuous-integration/gitlab-runner/remove-bash-test.patch

···

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

     

       2
       2
       -
       index b8a48f85e..0e3173fc3 100644

     

       2
       2
       +
       index 9ed9e65ff..02b6e6d5f 100644

     

       3
       3
        
       --- a/shells/bash_test.go

     

       4
       4
        
       +++ b/shells/bash_test.go

     

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

     

       6
       6
       -
        package shells

     

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

     

       7
       6
        
        

     

       8
       7
        
        import (

     

       8
       8
       +
        	"path"

     

       9
       9
        
       -	"runtime"

     

       10
       10
        
        	"testing"

     

       11
       11
        
        

     

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

     

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

     

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

     

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

     

       15
       15
        
        )

     

       16
       16
        
        

     

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

     

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

     

       19
       19
       -
        		})

     

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

     

       20
       18
        
        	}

     

       21
       19
        
        }

     

       22
       22
       -
       -

     

       20
       20
       +
        

     

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

     

       24
       22
        
       -	tests := map[string]struct {

     

       25
       23
        
       -		info common.ShellScriptInfo

     
···

       78
       76
        
       -		})

     

       79
       77
        
       -	}

     

       80
       78
        
       -}

     

       79
       79
       +
       -

     

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

     

       81
       81
       +
        	tmpDir := "/foo/bar"

     

       82
       82
       +
        	bw := BashWriter{TemporaryPath: tmpDir}