From 056a0dc5c1997510b05b6776dade34cb2416cebf Mon Sep 17 00:00:00 2001
From: Yaya <mak@nyantec.com>
Date: Mon, 19 Dec 2022 17:04:51 +0000
Subject: gitlab-runner: 15.5.1 -> 15.7.1

https://gitlab.com/gitlab-org/gitlab-runner/blob/v15.7.1/CHANGELOG.md
(cherry picked from commit 69e8c7131da2d8642a3481ce3bff87ce4161161a)
---
 .../continuous-integration/gitlab-runner/default.nix   |  7 ++++---
 .../gitlab-runner/remove-bash-test.patch               | 18 ++++++++++--------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix
index 2ab40ae599fa..6d9563f32218 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, buildGoModule, fetchFromGitLab, fetchurl, bash }:
 
 let
-  version = "15.5.1";
+  version = "15.7.1";
 in
 buildGoModule rec {
   inherit version;
@@ -17,13 +17,13 @@ buildGoModule rec {
   # For patchShebangs
   buildInputs = [ bash ];
 
-  vendorSha256 = "sha256-IcsYH1V3b5IUY2JqOADJrc4lkng1GS7lndfHObRQbxU=";
+  vendorSha256 = "sha256-GyhDns10eekU05D7SGbhYYlpK3OIajtUXXOcWgprBPc=";
 
   src = fetchFromGitLab {
     owner = "gitlab-org";
     repo = "gitlab-runner";
     rev = "v${version}";
-    sha256 = "sha256-ZvQaA4DSuEIdHEoRKJg5tOnBQgf26paTAiWy6RLRG3o=";
+    sha256 = "sha256-YHqezwud+/osCiqeR3QUvANFRU/oR451act+Crh4CRE=";
   };
 
   patches = [
@@ -46,6 +46,7 @@ buildGoModule rec {
     rm executors/docker/terminal_test.go
     rm executors/docker/docker_test.go
     rm helpers/docker/auth/auth_test.go
+    rm executors/docker/services_test.go
   '';
 
   postInstall = ''
diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/remove-bash-test.patch b/pkgs/development/tools/continuous-integration/gitlab-runner/remove-bash-test.patch
index 5bffd0f4f75e..6f27ef71c957 100644
--- a/pkgs/development/tools/continuous-integration/gitlab-runner/remove-bash-test.patch
+++ b/pkgs/development/tools/continuous-integration/gitlab-runner/remove-bash-test.patch
@@ -1,25 +1,23 @@
 diff --git a/shells/bash_test.go b/shells/bash_test.go
-index b8a48f85e..0e3173fc3 100644
+index 9ed9e65ff..02b6e6d5f 100644
 --- a/shells/bash_test.go
 +++ b/shells/bash_test.go
-@@ -4,12 +4,9 @@
- package shells
+@@ -4,11 +4,9 @@ package shells
  
  import (
+ 	"path"
 -	"runtime"
  	"testing"
  
  	"github.com/stretchr/testify/assert"
 -	"github.com/stretchr/testify/require"
--	"gitlab.com/gitlab-org/gitlab-runner/common"
+ 	"gitlab.com/gitlab-org/gitlab-runner/common"
  )
  
- func TestBash_CommandShellEscapesLegacy(t *testing.T) {
-@@ -84,62 +81,3 @@ func TestBash_CheckForErrors(t *testing.T) {
- 		})
+@@ -90,65 +88,6 @@ func TestBash_CheckForErrors(t *testing.T) {
  	}
  }
--
+ 
 -func TestBash_GetConfiguration(t *testing.T) {
 -	tests := map[string]struct {
 -		info common.ShellScriptInfo
@@ -78,3 +76,7 @@ index b8a48f85e..0e3173fc3 100644
 -		})
 -	}
 -}
+-
+ func Test_BashWriter_isTmpFile(t *testing.T) {
+ 	tmpDir := "/foo/bar"
+ 	bw := BashWriter{TemporaryPath: tmpDir}
-- 
cgit v1.2.3