summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--user/gitlab-runner/APKBUILD29
-rw-r--r--user/gitlab-runner/clean-tmpdirs.patch21
-rw-r--r--user/gitlab-runner/disable-crap.patch7
-rw-r--r--user/gitlab-runner/fix-multiple-redef-seek.patch38
-rw-r--r--user/gitlab-runner/gccgo.patch60
-rw-r--r--user/gitlab-runner/posix-shell-escape.patch139
-rw-r--r--user/gitlab-runner/posix-shell.patch30
-rw-r--r--user/gitlab-runner/tests.patch47
8 files changed, 52 insertions, 319 deletions
diff --git a/user/gitlab-runner/APKBUILD b/user/gitlab-runner/APKBUILD
index a2ef8fd9c..c5b01bd3b 100644
--- a/user/gitlab-runner/APKBUILD
+++ b/user/gitlab-runner/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Max Rees <maxcrees@me.com>
# Maintainer: Zach van Rijn <me@zv.io>
pkgname=gitlab-runner
-pkgver=12.1.0
-pkgrel=1
+pkgver=15.0.0
+pkgrel=0
_testver=91956efe
_branch="${pkgver%.*}"
_branch="${pkgver%%.*}-${_branch#*.}-stable"
@@ -22,19 +22,14 @@ source="https://gitlab.com/gitlab-org/gitlab-runner/-/archive/v$pkgver/gitlab-ru
https://dev.sick.bike/dist/gitlab-test-$_testver.tar.gz
$pkgname.confd
$pkgname.initd
- clean-tmpdirs.patch
disable-crap.patch
gccgo.patch
- posix-shell.patch
- posix-shell-escape.patch
tests.patch
- fix-multiple-redef-seek.patch
"
builddir="$srcdir/$pkgname-v$pkgver"
unpack() {
default_unpack
- mkdir "$builddir"/tmp
mv gitlab-test "$builddir"/tmp
}
@@ -43,7 +38,11 @@ _make() {
}
build() {
- _make build_simple
+ export GO111MODULE=on
+ export GOCACHE="$builddir"/tmp/go-build
+ export GOMODCACHE="$builddir"/go-mod
+ export GOFLAGS="-buildvcs=false -p=$JOBS -v -mod=readonly -modcacherw"
+ go build -o gitlab-runner .
}
check() {
@@ -65,7 +64,7 @@ check() {
}
package() {
- install -Dm755 out/binaries/gitlab-runner \
+ install -Dm755 gitlab-runner \
"$pkgdir"/usr/bin/gitlab-runner
install -dm750 -g gitlab-runner \
"$pkgdir"/etc/gitlab-runner
@@ -78,14 +77,10 @@ package() {
"$pkgdir"/etc/init.d/$pkgname
}
-sha512sums="1b3f06b7000252631bec04a58474dda826b0fb8d28c4144051a231fba5ef0c5c4b6e0f9ca6bdf9bf9b16b9117cbcf6385eb7bac85bda7b9f99de4300cbcc2066 gitlab-runner-v12.1.0.tar.gz
+sha512sums="8ba54e690fc45c1e22d174b649fbe3cf78707fd5a146c738c73cba045e6ac00499ddedd7a5f905c0c7e4e804a533d3fc718f8f7ac3c9ec5581de4dd9b3599c80 gitlab-runner-v15.0.0.tar.gz
7bccab81aa1cb88c6a0f83a6d3dfc509e6f9ecb4d0168a5b30cc4e8fdd823294b95fe3633e09757905466f83bb3bf73b1d28fac475dff2dc3164604db4b5b995 gitlab-test-91956efe.tar.gz
f8a0c7e77cd563d7e5b4fb2319181ceab8de44c555cefa4803e985ad3ac6a9fea7bca469d80b28974edcfb65f2095d019bfdf0abd8a3221464276a8d89debc0d gitlab-runner.confd
7f785a65b46919f6a6695e25fdc414ee3204eb9aa1a3735e7884575434af94b20a48f2fe7a1fb787473de23a7bd2d56bc1e9c1fc6b522c6f0c05c47b3d37ab1c gitlab-runner.initd
-f17a6b5053933d83d90272be7e98d4abf8d63e8a9c5ad30bbb61a29dbfa1e1b55421ba14be9f7db17cae30b2ff04efcb5da68543a2fa3d0e3e1882bc128cac06 clean-tmpdirs.patch
-a32b7a6fa28c7f5bcb505308e615f17de179c15ce8c2ef73078143204195e36d99b18489114ce694c3d821378c1e9ccb26a999a50372b97df163e2512080f07e disable-crap.patch
-4bc8f827cbcec212fcb1c5598aaf725138efa9a1de699d6261a65207cca7ef46f441edc02987efdd6d7c6e62943fda8f3f2a5a596d8d33b49fb78ba5df612e8b gccgo.patch
-444adec507c5eebcfae268f2f475d29316119f30750f06877a91dff56942d0e4d34ed3011b774b0d7acd59acfe2ddbe75082b3cd5aebd72ddb4703fd083ad301 posix-shell.patch
-05d12046448c79a12bf92974089ff97781304083f7bf35abb0b0c0f990c536bd6ff51652e16035a38e4ba5620dcad6e051ecdf4a80eb62039a15371073e525b5 posix-shell-escape.patch
-dae9c3f86fdf21bd41202fc2c0bc7dd764078ea9215d7ddbac1f7bc47b0943f7a912250a3006122f74ed50052378ed2c946eefe5c1ce8400cd682b183221025a tests.patch
-693d3abd94a85be70337bdfcbc3c643d65b95991689e085c573a793e4568f71966e398be960fd6bd985481613a1b85c459af814f83396d23e773afeee956b9f3 fix-multiple-redef-seek.patch"
+020a388f63758ecbcdd19ce3a290d2fd044e852174b6b7e1c79dc39d8d83ac161be5b63df8a9c60da315895e5385e9ac02bd3a46e02d45b96b8f939c90c444cd disable-crap.patch
+6bb477d2f40e651cb59f18ea18cfb051dd06cdfa3f976c6e17b72ee35733e9520a6323cec1f6b34d85fa46050b97bd20d4bb0f08a44f2cbfd4eb6914cfd5d604 gccgo.patch
+9b64665ec4c7f0edb7151b146666ea22283ac109193ff354510da018f14f1442c99707c753e5185caed2eb034600aa93ef5c95d960443339db89696acef96c3c tests.patch"
diff --git a/user/gitlab-runner/clean-tmpdirs.patch b/user/gitlab-runner/clean-tmpdirs.patch
deleted file mode 100644
index 89efd7a22..000000000
--- a/user/gitlab-runner/clean-tmpdirs.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Backport of: https://gitlab.com/gitlab-org/gitlab-runner/-/merge_requests/1978
-
---- gitlab-runner-v12.1.0/executors/custom/executor.go 2019-07-19 12:13:32.000000000 +0000
-+++ gitlab-runner-v12.1.0/executors/custom/executor.go 2020-04-27 00:19:46.613372635 +0000
-@@ -7,6 +7,7 @@ import (
- "fmt"
- "io"
- "io/ioutil"
-+ "os"
- "path/filepath"
-
- "github.com/sirupsen/logrus"
-@@ -216,6 +217,8 @@ func (e *executor) Cleanup() {
- return
- }
-
-+ defer os.RemoveAll(e.tempDir)
-+
- // nothing to do, as there's no cleanup_script
- if e.config.CleanupExec == "" {
- return
diff --git a/user/gitlab-runner/disable-crap.patch b/user/gitlab-runner/disable-crap.patch
index b375934fc..aab6a98b1 100644
--- a/user/gitlab-runner/disable-crap.patch
+++ b/user/gitlab-runner/disable-crap.patch
@@ -1,9 +1,10 @@
--- gitlab-runner-v12.1.0/main.go 2019-07-19 12:13:32.000000000 +0000
+++ gitlab-runner-v12.1.0/main.go 2020-03-04 22:28:31.741878923 +0000
-@@ -11,18 +11,11 @@ import (
- "gitlab.com/gitlab-org/gitlab-runner/helpers/cli"
+@@ -12,19 +12,11 @@ import (
+ cli_helpers "gitlab.com/gitlab-org/gitlab-runner/helpers/cli"
"gitlab.com/gitlab-org/gitlab-runner/log"
+- _ "gitlab.com/gitlab-org/gitlab-runner/cache/azure"
- _ "gitlab.com/gitlab-org/gitlab-runner/cache/gcs"
- _ "gitlab.com/gitlab-org/gitlab-runner/cache/s3"
_ "gitlab.com/gitlab-org/gitlab-runner/commands"
@@ -16,6 +17,6 @@
_ "gitlab.com/gitlab-org/gitlab-runner/executors/shell"
_ "gitlab.com/gitlab-org/gitlab-runner/executors/ssh"
- _ "gitlab.com/gitlab-org/gitlab-runner/executors/virtualbox"
+ _ "gitlab.com/gitlab-org/gitlab-runner/helpers/secrets/resolvers/vault"
_ "gitlab.com/gitlab-org/gitlab-runner/shells"
)
-
diff --git a/user/gitlab-runner/fix-multiple-redef-seek.patch b/user/gitlab-runner/fix-multiple-redef-seek.patch
deleted file mode 100644
index 5a9d1ef10..000000000
--- a/user/gitlab-runner/fix-multiple-redef-seek.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff -ur a/vendor/golang.org/x/sys/unix/syscall_linux_arm.go b/vendor/golang.org/x/sys/unix/syscall_linux_arm.go
---- a/vendor/golang.org/x/sys/unix/syscall_linux_arm.go 2023-01-04 02:17:18.689781320 +0000
-+++ b/vendor/golang.org/x/sys/unix/syscall_linux_arm.go 2023-01-04 02:19:46.688219811 +0000
-@@ -45,7 +45,13 @@
-
- // Underlying system call writes to newoffset via pointer.
- // Implemented in assembly to avoid allocation.
--func seek(fd int, offset int64, whence int) (newoffset int64, err syscall.Errno)
-+func seek(fd int, offset int64, whence int) (int64, syscall.Errno) {
-+ var newoffset int64
-+ offsetLow := uint32(offset & 0xffffffff)
-+ offsetHigh := uint32((offset >> 32) & 0xffffffff)
-+ _, _, err := Syscall6(SYS__LLSEEK, uintptr(fd), uintptr(offsetHigh), uintptr(offsetLow), uintptr(unsafe.Pointer(&newoffset)), uintptr(whence), 0)
-+ return newoffset, err
-+}
-
- func Seek(fd int, offset int64, whence int) (newoffset int64, err error) {
- newoffset, errno := seek(fd, offset, whence)
-diff -ur a/vendor/golang.org/x/sys/unix/syscall_linux_gccgo_arm.go b/vendor/golang.org/x/sys/unix/syscall_linux_gccgo_arm.go
---- a/vendor/golang.org/x/sys/unix/syscall_linux_gccgo_arm.go 2023-01-04 02:17:18.689781320 +0000
-+++ b/vendor/golang.org/x/sys/unix/syscall_linux_gccgo_arm.go 2023-01-04 02:20:04.283558738 +0000
-@@ -2,7 +2,7 @@
- // Use of this source code is governed by a BSD-style
- // license that can be found in the LICENSE file.
-
--// +build linux,gccgo,arm
-+// +build linux,!gccgo,arm
-
- package unix
-
-@@ -11,6 +11,7 @@
- "unsafe"
- )
-
-+// this file should not be built
- func seek(fd int, offset int64, whence int) (int64, syscall.Errno) {
- var newoffset int64
- offsetLow := uint32(offset & 0xffffffff)
diff --git a/user/gitlab-runner/gccgo.patch b/user/gitlab-runner/gccgo.patch
index 6c10893c7..c8704280c 100644
--- a/user/gitlab-runner/gccgo.patch
+++ b/user/gitlab-runner/gccgo.patch
@@ -12,45 +12,45 @@
BUILT := $(shell date -u +%Y-%m-%dT%H:%M:%S%z)
-export TESTFLAGS ?= -cover
- LATEST_STABLE_TAG := $(shell git -c versionsort.prereleaseSuffix="-rc" -c versionsort.prereleaseSuffix="-RC" tag -l "v*.*.*" --sort=-v:refname | awk '!/rc/' | head -n 1)
+ LATEST_STABLE_TAG := $(shell git -c versionsort.prereleaseSuffix="-rc" -c versionsort.prereleaseSuffix="-RC" tag -l "v*.*.*" | sort -rV | awk '!/rc/' | head -n 1)
export IS_LATEST :=
-@@ -45,14 +44,11 @@ export PATH := $(GOPATH_BIN):$(PATH)
+@@ -36,14 +35,11 @@ export PATH := $(GOPATH_BIN):$(PATH)
+ BUILD_DIR := $(CURDIR)
+ TARGET_DIR := $(BUILD_DIR)/out
- # Packages in vendor/ are included in ./...
- # https://github.com/golang/go/issues/11659
--export OUR_PACKAGES ?= $(subst _$(BUILD_DIR),$(PKG),$(shell go list ./... | grep -v '/vendor/'))
-+export OUR_PACKAGES ?= $(subst _$(BUILD_DIR),$(PKG),$(shell go list ./... | grep -ve '/vendor/' -e '/cache/gcs' -e '/cache/s3' -e '/docker' -e '/kubernetes' -e '/parallels' -e '/virtualbox'))
+ export MAIN_PACKAGE ?= gitlab.com/gitlab-org/gitlab-runner
-GO_LDFLAGS ?= -X $(COMMON_PACKAGE_NAMESPACE).NAME=$(PACKAGE_NAME) -X $(COMMON_PACKAGE_NAMESPACE).VERSION=$(VERSION) \
- -X $(COMMON_PACKAGE_NAMESPACE).REVISION=$(REVISION) -X $(COMMON_PACKAGE_NAMESPACE).BUILT=$(BUILT) \
- -X $(COMMON_PACKAGE_NAMESPACE).BRANCH=$(BRANCH) \
-- -s -w
-+GO_LDFLAGS ?= -s -w
- GO_FILES ?= $(shell find . -name '*.go' | grep -v './.gopath/')
+- -w
++GO_LDFLAGS ?= -w
+ GO_FILES ?= $(shell find . -name '*.go')
-export CGO_ENABLED ?= 0
+export CGO_ENABLED ?= 1
# Development Tools
-@@ -114,7 +110,7 @@ build: $(GOX)
- build_simple: $(GOPATH_SETUP)
- # Building $(NAME) in version $(VERSION) for current platform
-- go build \
-- -ldflags "$(GO_LDFLAGS)" \
-+ go build -v \
-+ -gccgoflags "$(GO_LDFLAGS)" \
- -o "out/binaries/$(NAME)" \
- $(PKG)
-
-@@ -123,7 +119,7 @@ build_current: helper-docker build_simpl
- check_race_conditions:
- @./scripts/check_race_conditions $(OUR_PACKAGES)
+@@ -137,7 +133,7 @@ build_current: helper-docker build_simpl
+ simple-test: TEST_PKG ?= $(shell go list ./...)
+ simple-test:
+ # use env -i to clear parent environment variables for go test
+- ./scripts/go_test_no_env $(TEST_PKG) $(TESTFLAGS) -ldflags "$(GO_LDFLAGS)"
++ ./scripts/go_test_no_env $(TEST_PKG) $(TESTFLAGS) -gccgoflags "$(GO_LDFLAGS)"
--test: $(PKG_BUILD_DIR) helper-docker
-+test: $(PKG_BUILD_DIR)
- go test $(OUR_PACKAGES) $(TESTFLAGS)
-
- parallel_test_prepare: $(GOPATH_SETUP)
+ git1.8-test: export TEST_PKG = gitlab.com/gitlab-org/gitlab-runner/executors/shell gitlab.com/gitlab-org/gitlab-runner/shells
+ git1.8-test:
+--- gitlab-runner-v13.0.0/Makefile.build.mk.old 2020-05-20 03:10:39.000000000 -0500
++++ gitlab-runner-v13.0.0/Makefile.build.mk 2024-05-30 22:18:11.590776424 -0500
+@@ -1,6 +1,5 @@
+ runner-bin: $(GOX)
+ # Building $(NAME) in version $(VERSION) for $(BUILD_PLATFORMS)
+- $(GOX) $(BUILD_PLATFORMS) \
+- -ldflags "$(GO_LDFLAGS)" \
+- -output="out/binaries/$(NAME)-{{.OS}}-{{.Arch}}" \
++ go build -v \
++ -gccgoflags "$(GO_LDFLAGS)" \
+ $(PKG)
--- gitlab-runner-v12.1.0/common/version.go 2019-07-19 12:13:32.000000000 +0000
+++ gitlab-runner-v12.1.0/common/version.go 2020-04-27 00:57:04.923408027 +0000
@@ -9,9 +9,9 @@ import (
@@ -60,9 +60,9 @@
-var VERSION = "development version"
-var REVISION = "HEAD"
-var BRANCH = "HEAD"
-+var VERSION = "12.1.0"
-+var REVISION = "v12.1.0"
-+var BRANCH = "12-1-stable"
++var VERSION = "15.0.0"
++var REVISION = "v15.0.0"
++var BRANCH = "15-0-stable"
var BUILT = "unknown"
var AppVersion AppVersionInfo
diff --git a/user/gitlab-runner/posix-shell-escape.patch b/user/gitlab-runner/posix-shell-escape.patch
deleted file mode 100644
index b454141ed..000000000
--- a/user/gitlab-runner/posix-shell-escape.patch
+++ /dev/null
@@ -1,139 +0,0 @@
---- gitlab-runner-v12.1.0/helpers/shell_escape.go 2019-07-19 12:13:32.000000000 +0000
-+++ gitlab-runner-v12.1.0/helpers/shell_escape.go 2020-04-26 23:12:59.813309281 +0000
-@@ -4,7 +4,6 @@ package helpers
-
- import (
- "bytes"
-- "encoding/hex"
- "strings"
- )
-
-@@ -13,35 +12,10 @@ import (
- */
-
- const (
-- ACK = 6
-- TAB = 9
-- LF = 10
-- CR = 13
-- US = 31
-- SPACE = 32
-- AMPERSTAND = 38
- SINGLE_QUOTE = 39
-- PLUS = 43
-- NINE = 57
-- QUESTION = 63
-- LOWERCASE_Z = 90
-- OPEN_BRACKET = 91
- BACKSLASH = 92
-- UNDERSCORE = 95
-- CLOSE_BRACKET = 93
-- BACKTICK = 96
-- TILDA = 126
-- DEL = 127
- )
-
--// ShellEscape is taken from https://github.com/solidsnack/shell-escape/blob/master/Text/ShellEscape/Bash.hs
--/*
--A Bash escaped string. The strings are wrapped in @$\'...\'@ if any
--bytes within them must be escaped; otherwise, they are left as is.
--Newlines and other control characters are represented as ANSI escape
--sequences. High bytes are represented as hex codes. Thus Bash escaped
--strings will always fit on one line and never contain non-ASCII bytes.
--*/
- func ShellEscape(str string) string {
- if str == "" {
- return "''"
-@@ -50,85 +24,20 @@ func ShellEscape(str string) string {
- out := bytes.NewBuffer(make([]byte, 0, len(str)*2))
- i := 0
- l := len(in)
-- escape := false
--
-- hex := func(char byte) {
-- escape = true
--
-- data := []byte{BACKSLASH, 'x', 0, 0}
-- hex.Encode(data[2:], []byte{char})
-- out.Write(data)
-- }
--
-- backslash := func(char byte) {
-- escape = true
-- out.Write([]byte{BACKSLASH, char})
-- }
--
-- escaped := func(str string) {
-- escape = true
-- out.WriteString(str)
-- }
--
-- quoted := func(char byte) {
-- escape = true
-- out.WriteByte(char)
-- }
--
-- literal := func(char byte) {
-- out.WriteByte(char)
-- }
-
-+ out.WriteByte(SINGLE_QUOTE)
- for i < l {
- char := in[i]
-- switch {
-- case char == TAB:
-- escaped(`\t`)
-- case char == LF:
-- escaped(`\n`)
-- case char == CR:
-- escaped(`\r`)
-- case char <= US:
-- hex(char)
-- case char <= AMPERSTAND:
-- quoted(char)
-- case char == SINGLE_QUOTE:
-- backslash(char)
-- case char <= PLUS:
-- quoted(char)
-- case char <= NINE:
-- literal(char)
-- case char <= QUESTION:
-- quoted(char)
-- case char <= LOWERCASE_Z:
-- literal(char)
-- case char == OPEN_BRACKET:
-- quoted(char)
-- case char == BACKSLASH:
-- backslash(char)
-- case char <= CLOSE_BRACKET:
-- quoted(char)
-- case char == UNDERSCORE:
-- literal(char)
-- case char <= BACKTICK:
-- quoted(char)
-- case char <= TILDA:
-- quoted(char)
-- case char == DEL:
-- hex(char)
-- default:
-- hex(char)
-+ if (char == SINGLE_QUOTE) {
-+ out.Write([]byte{SINGLE_QUOTE, BACKSLASH, SINGLE_QUOTE, SINGLE_QUOTE})
-+ } else {
-+ out.WriteByte(char)
- }
- i++
- }
-+ out.WriteByte(SINGLE_QUOTE)
-
-- outStr := out.String()
--
-- if escape {
-- outStr = "$'" + outStr + "'"
-- }
--
-- return outStr
-+ return out.String()
- }
-
- func ToBackslash(path string) string {
diff --git a/user/gitlab-runner/posix-shell.patch b/user/gitlab-runner/posix-shell.patch
deleted file mode 100644
index 6169c3ecc..000000000
--- a/user/gitlab-runner/posix-shell.patch
+++ /dev/null
@@ -1,30 +0,0 @@
---- gitlab-runner-v12.1.0/shells/bash.go 2019-07-19 12:13:32.000000000 +0000
-+++ gitlab-runner-v12.1.0/shells/bash.go 2020-04-26 23:07:57.303304498 +0000
-@@ -102,12 +102,12 @@ func (b *BashWriter) Variable(variable c
- }
-
- func (b *BashWriter) IfDirectory(path string) {
-- b.Line(fmt.Sprintf("if [[ -d %q ]]; then", path))
-+ b.Line(fmt.Sprintf("if [ -d %q ]; then", path))
- b.Indent()
- }
-
- func (b *BashWriter) IfFile(path string) {
-- b.Line(fmt.Sprintf("if [[ -e %q ]]; then", path))
-+ b.Line(fmt.Sprintf("if [ -e %q ]; then", path))
- b.Indent()
- }
-
-@@ -200,9 +200,10 @@ func (b *BashWriter) Finish(trace bool)
- io.WriteString(w, "set -o xtrace\n")
- }
-
-- io.WriteString(w, "set -eo pipefail\n")
-+ io.WriteString(w, "set -e\n")
- io.WriteString(w, "set +o noclobber\n")
-- io.WriteString(w, ": | eval "+helpers.ShellEscape(b.String())+"\n")
-+ io.WriteString(w, "(\nexec </dev/null\n")
-+ io.WriteString(w, b.String() + "\n)\n")
- io.WriteString(w, "exit 0\n")
- w.Flush()
- return buffer.String()
diff --git a/user/gitlab-runner/tests.patch b/user/gitlab-runner/tests.patch
index 1aff6c653..0762b6b13 100644
--- a/user/gitlab-runner/tests.patch
+++ b/user/gitlab-runner/tests.patch
@@ -1,58 +1,23 @@
--- gitlab-runner-v12.1.0/shells/bash_test.go 2019-07-19 12:13:32.000000000 +0000
+++ gitlab-runner-v12.1.0/shells/bash_test.go 2020-04-27 00:07:06.763360621 +0000
-@@ -10,12 +10,12 @@ func TestBash_CommandShellEscapes(t *tes
- writer := &BashWriter{}
+@@ -16,12 +16,12 @@ func TestBash_CommandShellEscapes(t *tes
+ writer := &BashWriter{useNewEscape: false}
writer.Command("foo", "x&(y)")
- assert.Equal(t, `$'foo' "x&(y)"`+"\n", writer.String())
+ assert.Equal(t, `'foo' "x&(y)"`+"\n", writer.String())
}
- func TestBash_IfCmdShellEscapes(t *testing.T) {
- writer := &BashWriter{}
+ func TestBash_IfCmdShellEscapesLegacy(t *testing.T) {
+ writer := &BashWriter{useNewEscape: false}
writer.IfCmd("foo", "x&(y)")
-- assert.Equal(t, `if $'foo' "x&(y)" >/dev/null 2>/dev/null; then`+"\n", writer.String())
+- assert.Equal(t, `if $'foo' "x&(y)" >/dev/null 2>&1; then`+"\n", writer.String())
+ assert.Equal(t, `if 'foo' "x&(y)" >/dev/null 2>/dev/null; then`+"\n", writer.String())
}
---- gitlab-runner-v12.1.0/executors/shell/executor_shell_test.go 2019-07-19 12:13:32.000000000 +0000
-+++ gitlab-runner-v12.1.0/executors/shell/executor_shell_test.go 2020-04-27 00:01:12.813355024 +0000
-@@ -166,7 +166,7 @@ func TestBuildAbort(t *testing.T) {
- defer abortTimer.Stop()
-
- err = runBuild(t, build)
-- assert.EqualError(t, err, "aborted: interrupt")
-+ assert.EqualError(t, err, "aborted: Interrupt")
- })
- }
-
---- gitlab-runner-v12.1.0/executors/custom/executor_integration_test.go 2019-07-19 12:13:32.000000000 +0000
-+++ gitlab-runner-v12.1.0/executors/custom/executor_integration_test.go 2020-04-27 00:00:42.493354545 +0000
-@@ -234,7 +234,7 @@ func TestBuildAbort(t *testing.T) {
- defer abortTimer.Stop()
-
- err = runBuild(t, build)
-- assert.EqualError(t, err, "aborted: interrupt")
-+ assert.EqualError(t, err, "aborted: Interrupt")
- })
- }
-
---- gitlab-runner-v12.1.0/helpers/shell_escape_test.go 2019-07-19 12:13:32.000000000 +0000
-+++ gitlab-runner-v12.1.0/helpers/shell_escape_test.go 2020-04-27 00:02:36.213356343 +0000
-@@ -24,8 +24,8 @@ func TestShellEscape(t *testing.T) {
- in string
- out string
- }{
-- {"standard string", "$'standard string'"},
-- {"+\t\n\r&", "$'+\\t\\n\\r&'"},
-+ {"standard string", "'standard string'"},
-+ {"+\t\n\r&", "'+\t\n\r&'"},
- {"", "''"},
- }
-
--- gitlab-runner-v12.1.0/common/build_test.go 2019-07-19 12:13:32.000000000 +0000
+++ gitlab-runner-v12.1.0/common/build_test.go 2020-04-27 00:23:35.173376249 +0000
-@@ -1133,7 +1133,7 @@ func TestWaitForTerminal(t *testing.T) {
+@@ -1255,7 +1255,7 @@ func TestWaitForTerminal(t *testing.T) {
},
jobTimeout: 3600,
waitForTerminalTimeout: time.Hour,
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-12-18 01:56:05 +0000