diff options
| author | Quang-Minh Nguyen <qmnguyen@gitlab.com> | 2022-12-20 18:14:34 +0300 |
|---|---|---|
| committer | Quang-Minh Nguyen <qmnguyen@gitlab.com> | 2022-12-20 18:14:34 +0300 |
| commit | 4d7604451b6942d32900757461a304e7c5166179 (patch) | |
| tree | 6e2bd707245c4e90e3555541d6f3780e16439db4 | |
| parent | d931585a91be42e1902f880162a49713940c82e9 (diff) | |
| parent | 8b6c7b9f7b97b6f4c2adfac64b01feec97812e74 (diff) | |
Merge branch 'pks-makefile-upgrade-git-15.6' into '15-6-stable'backport-qa-15-6-stable
Makefile: Upgrade Git to v2.35.4.gl1 and v2.37.4.gl1 (v15.6 backport)
See merge request https://gitlab.com/gitlab-org/gitaly/-/merge_requests/5189
Merged-by: Quang-Minh Nguyen <qmnguyen@gitlab.com>
Approved-by: karthik nayak <knayak@gitlab.com>
Approved-by: Quang-Minh Nguyen <qmnguyen@gitlab.com>
Co-authored-by: Patrick Steinhardt <psteinhardt@gitlab.com>
| -rw-r--r-- | .gitlab-ci.yml | 3 | ||||
| -rw-r--r-- | Makefile | 15 |
2 files changed, 15 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1470ac844..e66497f26 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -250,6 +250,9 @@ test:pgbouncer: test:nightly: <<: *test_definition + variables: + <<: *test_variables + SKIP_OVERRIDING_GIT_VERSION: "YesPlease" parallel: matrix: - GIT_VERSION: [ "master", "next" ] @@ -134,14 +134,19 @@ GIT_EXECUTABLES += git-http-backend ## tags, branches, and commit ids. GIT_VERSION ?= ## The Git version used for bundled Git v2.37. -GIT_VERSION_2_37_1 ?= v2.37.1.gl1 +GIT_VERSION_2_37_1 ?= v2.37.4.gl1 ## The Git version used for bundled Git v2.38. -GIT_VERSION_2_38 ?= v2.38.1.gl0 +GIT_VERSION_2_38 ?= v2.38.2.gl1 + +## Skip overriding the Git version and instead use the Git version as specified +## in the Git sources. This is required when building Git from a version that +## cannot be parsed by Gitaly. +SKIP_OVERRIDING_GIT_VERSION ?= # The default version is used in case the caller does not set the variable or # if it is either set to the empty string or "default". ifeq (${GIT_VERSION:default=},) - override GIT_VERSION := v2.37.1.gl1 + override GIT_VERSION := v2.37.4.gl1 else # Support both vX.Y.Z and X.Y.Z version patterns, since callers across GitLab # use both. @@ -654,10 +659,14 @@ ${DEPENDENCY_DIR}/git-%/Makefile: ${DEPENDENCY_DIR}/git-%.version ${Q}${GIT} -C "${@D}" fetch --depth 1 ${GIT_QUIET} origin ${GIT_VERSION} ${Q}${GIT} -C "${@D}" reset --hard ${Q}${GIT} -C "${@D}" checkout ${GIT_QUIET} --detach FETCH_HEAD +ifdef SKIP_OVERRIDING_GIT_VERSION + ${Q}rm -f "${@D}"/version +else @ # We're writing the version into the "version" file in Git's own source @ # directory. If it exists, Git's Makefile will pick it up and use it as @ # the version instead of auto-detecting via git-describe(1). ${Q}echo ${GIT_VERSION} >"${@D}"/version +endif ${Q}touch $@ $(patsubst %,${DEPENDENCY_DIR}/git-\%/%,${GIT_EXECUTABLES}): ${DEPENDENCY_DIR}/git-%/Makefile |