diff options
| author | Patrick Steinhardt <psteinhardt@gitlab.com> | 2021-09-13 14:40:20 +0300 |
|---|---|---|
| committer | Patrick Steinhardt <psteinhardt@gitlab.com> | 2021-09-13 16:23:18 +0300 |
| commit | 96b9791a4359667f5536e7836d2a5de8158f2edf (patch) | |
| tree | d5f9974b0520d41666556115c4050c122eb16dac | |
| parent | ff2f210d613cff6d208afd9409860c3394c8fb0e (diff) | |
ci: Fix Git patches being applied on top of non-default versions
We have recently started to grow a set of Git patches on top of our own
Git version. While the intention is that those patches are only applied
for the default Git version of ours, where Gitaly must support Git with
and without these patches, we have indeed been applying those patches to
all our currently tested Git versions. In fact, it's by pure chance only
that all patches apply to v2.31.1, v2.32.0 and v2.33.0.
We're about to add some patches which do not apply on the older Git
versions and which thus break those builds. This commit thus fixes the
CI job definitions for non-v2.33.0 version by explicitly overriding the
GIT_PATCHES variable such that our Makefile won't set up the default set
of patches anymore.
| -rw-r--r-- | .gitlab-ci.yml | 25 |
1 files changed, 22 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index babe2a13c..fac8c0e9f 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -140,8 +140,17 @@ build: - _support/test-boot . parallel: matrix: + # These definitions are for the non-default Git versions. We do not want + # to apply any additional Git patches on top of those given that they may + # not cleanly apply and thus set GIT_PATCHES="". - GO_VERSION: [ "1.15", "1.16", "1.17" ] - GIT_VERSION: [ "v2.31.1", "v2.32.0", "v2.33.0" ] + GIT_VERSION: [ "v2.31.1", "v2.32.0" ] + GIT_PATCHES: [ "" ] + RUBY_VERSION: [ "2.7" ] + # These definitions are for the default Git version where we want to + # apply our default set of Git patches. + - GO_VERSION: [ "1.15", "1.16", "1.17" ] + GIT_VERSION: [ "v2.33.0" ] RUBY_VERSION: [ "2.7" ] binaries: @@ -183,8 +192,17 @@ test: junit: _build/reports/go-tests-report-go-${GO_VERSION}-git-${GIT_VERSION}.xml parallel: matrix: + # These definitions are for the non-default Git versions. We do not want + # to apply any additional Git patches on top of those given that they may + # not cleanly apply and thus set GIT_PATCHES="". + - GO_VERSION: [ "1.15", "1.16", "1.17" ] + GIT_VERSION: [ "v2.31.1", "v2.32.0" ] + GIT_PATCHES: [ "" ] + TARGET: test + # These definitions are for the default Git version where we want to + # apply our default set of Git patches. - GO_VERSION: [ "1.15", "1.16", "1.17" ] - GIT_VERSION: [ "v2.31.1", "v2.32.0", "v2.33.0" ] + GIT_VERSION: [ "v2.33.0" ] TARGET: test - GO_VERSION: "1.17" TARGET: [ test-with-proxies, test-with-praefect, race-go ] @@ -195,11 +213,12 @@ 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} GIT_PATCHES= + - make all ${TARGET} parallel: matrix: - GO_VERSION: "1.17" GIT_VERSION: ["master", "next"] + GIT_PATCHES: [ "" ] TARGET: [ test, test-with-proxies, test-with-praefect ] rules: - if: '$CI_PIPELINE_SOURCE == "schedule"' |