gitlab-runner: 17.2.0 -> 17.9.1 #392089
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| diff --git a/executors/kubernetes/kubernetes_test.go b/executors/kubernetes/kubernetes_test.go | ||
| index ba50f31e0..c500e3a26 100644 | ||
| --- a/executors/kubernetes/kubernetes_test.go | ||
| +++ b/executors/kubernetes/kubernetes_test.go | ||
| @@ -2815,6 +2815,9 @@ func TestPrepare(t *testing.T) { | ||
| if runtime.GOOS == "windows" { | ||
| return false, "skipping test, because we are running on windows" | ||
| } | ||
| + if runtime.GOARCH == "arm64" { | ||
| + return false, "skipping test, because of fix assertion we should be on x86" | ||
| + } | ||
| return true, "" | ||
| }, | ||
| WindowsKernelVersionGetter: func() string { |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,42 @@ | ||
| diff --git a/commands/wrapper_test.go b/commands/wrapper_test.go | ||
| index c897c8170..b5ad47acf 100644 | ||
| --- a/commands/wrapper_test.go | ||
| +++ b/commands/wrapper_test.go | ||
| @@ -16,10 +16,13 @@ import ( | ||
| func TestRunnerWrapperCommand_createListener(t *testing.T) { | ||
| testSocketPath := filepath.Join(t.TempDir(), "test.sock") | ||
|
|
||
| - skipOnWindows := func(t *testing.T) { | ||
| + skipCondition := func(t *testing.T) { | ||
| if runtime.GOOS == "windows" { | ||
| t.Skip("Test doesn't work reliably on Windows (unix socket usage)") | ||
| } | ||
| + if runtime.GOOS == "darwin" { | ||
| + t.Skip("Test doesn't work reliably on Darwin with enabled sandbox") | ||
| + } | ||
| } | ||
|
|
||
| tests := map[string]struct { | ||
| @@ -36,19 +39,19 @@ func TestRunnerWrapperCommand_createListener(t *testing.T) { | ||
| }, | ||
| }, | ||
| "proper unix socket - unix://": { | ||
| - skip: skipOnWindows, | ||
| + skip: skipCondition, | ||
| grpcAddress: fmt.Sprintf("unix://%s", testSocketPath), | ||
| expectedNetwork: "unix", | ||
| expectedAddress: testSocketPath, | ||
| }, | ||
| "proper unix socket - unix:": { | ||
| - skip: skipOnWindows, | ||
| + skip: skipCondition, | ||
| grpcAddress: fmt.Sprintf("unix://%s", testSocketPath), | ||
| expectedNetwork: "unix", | ||
| expectedAddress: testSocketPath, | ||
| }, | ||
| "invalid unix socket": { | ||
| - skip: skipOnWindows, | ||
| + skip: skipCondition, | ||
| grpcAddress: fmt.Sprintf("unix:/%s", testSocketPath), | ||
| assertError: func(t *testing.T, err error) { | ||
| var eerr *net.OpError |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| diff --git a/helpers/certificate/x509_test.go b/helpers/certificate/x509_test.go | ||
| index 8afe0d9e8..7eac8a691 100644 | ||
| --- a/helpers/certificate/x509_test.go | ||
| +++ b/helpers/certificate/x509_test.go | ||
| @@ -8,6 +8,7 @@ import ( | ||
| "net" | ||
| "net/http" | ||
| "regexp" | ||
| + "runtime" | ||
| "testing" | ||
|
|
||
| "github.com/stretchr/testify/assert" | ||
| @@ -62,6 +63,9 @@ func TestCertificate(t *testing.T) { | ||
| _, err = client.Do(req) | ||
| assert.Error(t, err) | ||
| // Error messages provided by Linux and MacOS respectively. | ||
| - const want = "certificate signed by unknown authority|certificate is not trusted" | ||
| - assert.Regexp(t, regexp.MustCompile(want), err.Error()) | ||
| + // Nix sandbox prevents the test from working | ||
| + if runtime.GOOS != "darwin" { | ||
| + const want = "certificate signed by unknown authority|certificate is not trusted" | ||
| + assert.Regexp(t, regexp.MustCompile(want), err.Error()) | ||
| + } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,29 @@ | ||
| diff --git a/Makefile b/Makefile | ||
| index e948db0d6d..cd0957251e 100644 | ||
| --- a/Makefile | ||
| +++ b/Makefile | ||
| @@ -3,14 +3,10 @@ | ||
| export PACKAGE_NAME ?= $(NAME) | ||
| export VERSION := $(shell ./ci/version) | ||
| REVISION := $(shell git rev-parse --short=8 HEAD || echo unknown) | ||
| -BRANCH := $(shell git show-ref | grep "$(REVISION)" | grep -v HEAD | awk '{print $$2}' | sed 's|refs/remotes/origin/||' | sed 's|refs/heads/||' | sort | head -n 1) | ||
| +BRANCH := | ||
| export TESTFLAGS ?= -cover | ||
|
|
||
| -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 := | ||
| -ifeq ($(shell git describe --exact-match --match $(LATEST_STABLE_TAG) >/dev/null 2>&1; echo $$?), 0) | ||
| -export IS_LATEST := true | ||
| -endif | ||
|
|
||
| PACKAGE_CLOUD ?= runner/gitlab-runner | ||
| PACKAGE_CLOUD_URL ?= https://packages.gitlab.com | ||
| @@ -32,7 +28,7 @@ | ||
| export MAIN_PACKAGE ?= gitlab.com/gitlab-org/gitlab-runner | ||
|
|
||
| GO_LDFLAGS ?= -X $(COMMON_PACKAGE_NAMESPACE).NAME=$(APP_NAME) -X $(COMMON_PACKAGE_NAMESPACE).VERSION=$(VERSION) \ | ||
| - -X $(COMMON_PACKAGE_NAMESPACE).BRANCH=$(BRANCH) \ | ||
| + -X $(COMMON_PACKAGE_NAMESPACE).REVISION=$(REVISION) -X $(COMMON_PACKAGE_NAMESPACE).BRANCH=$(BRANCH) \ | ||
| -w | ||
|
|
||
| GO_TEST_LDFLAGS ?= -X $(COMMON_PACKAGE_NAMESPACE).NAME=$(APP_NAME) |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Perhaps I am wrong but, I think the
.gitfolder is stripped out, sogit rev-parsewon't work.Have you tested this?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
That's correct. I switched back to draft, as I made a mistake while pushing. 17.9.2 introduced further changes (mroe tests fail when not there is no .git directory). I'm currently trying some more things...