diff options
| author | Patrick Steinhardt <psteinhardt@gitlab.com> | 2021-04-23 09:56:14 +0300 |
|---|---|---|
| committer | Patrick Steinhardt <psteinhardt@gitlab.com> | 2021-04-23 10:45:44 +0300 |
| commit | e9062248344e9b8017885656b6a053b8f9a16907 (patch) | |
| tree | 4cbfb41513c0aab726cde1273079c1c99132671e | |
| parent | 8a71e9c70c598cc2dcbc300b2e67fbf29c194645 (diff) | |
ci: Fix nightly jobs failing because git patches do not apply
Our nightly job tests against git's next and master branches to verify
that there's not going to be any new incompatibilities with the upcoming
git version. But since we have started to apply custom patches to git,
this nightly job has started to fail because the patch does not apply on
top of these branches.
Override GIT_PATCHES for this job such that we test against unpatched
versions of git.
| -rw-r--r-- | .gitlab-ci.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bf1a25bf8..187a2158f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -171,7 +171,7 @@ nightly:git: image: registry.gitlab.com/gitlab-org/gitlab-build-images:ruby-${RUBY_VERSION}-golang-${GO_VERSION}-git-2.31 script: - go version - - make all ${TARGET} + - make all ${TARGET} GIT_PATCHES= parallel: matrix: - GO_VERSION: "1.16" |