Merge pull request #206875 from yayayayaka/gitlab-runner-15.7.1

gitlab-runner: 15.5.1 -> 15.7.1
This commit is contained in:
Pascal Bach 2022-12-19 22:31:13 +01:00 committed by GitHub
commit 6052729bba
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 11 deletions

View file

@ -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 = ''

View file

@ -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}