diff options
author | Karthik Nayak <knayak@gitlab.com> | 2023-08-28 10:18:46 +0300 |
---|---|---|
committer | Karthik Nayak <knayak@gitlab.com> | 2023-08-28 10:18:46 +0300 |
commit | a56e2d0f5dc912a67800364a2e916273c5f73b80 (patch) | |
tree | 8f2fae43f046a973fe765ec34590fa9ace9a930a | |
parent | 704f12ccd332c086dc06c5bd4658e7fe7bc6a70c (diff) |
Revert "Merge branch '5534-rollout-git-version-v2-42-0' into 'master'"
This reverts commit d62c05df4a1a1a3ae5c2aa249676758e31bf5ae3, reversing
changes made to e836dcbf46c68b6c5011ff482e753ddad55c6b95.
-rw-r--r-- | Makefile | 12 | ||||
-rw-r--r-- | internal/featureflag/ff_git_v242.go | 9 | ||||
-rw-r--r-- | internal/git/execution_environment.go | 7 | ||||
-rw-r--r-- | internal/testhelper/testhelper.go | 2 |
4 files changed, 2 insertions, 28 deletions
@@ -130,8 +130,6 @@ GIT_EXECUTABLES += git-http-backend GIT_VERSION ?= ## The Git version used for bundled Git v2.41. GIT_VERSION_2_41 ?= v2.41.0.gl1 -## The Git version used for bundled Git v2.42. -GIT_VERSION_2_42 ?= v2.42.0 ## 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 @@ -323,16 +321,14 @@ install: build .PHONY: build-bundled-git ## Build bundled Git binaries. -build-bundled-git: build-bundled-git-v2.41 build-bundled-git-v2.42 +build-bundled-git: build-bundled-git-v2.41 build-bundled-git-v2.41: $(patsubst %,${BUILD_DIR}/bin/gitaly-%-v2.41,${GIT_EXECUTABLES}) -build-bundled-git-v2.42: $(patsubst %,${BUILD_DIR}/bin/gitaly-%-v2.42,${GIT_EXECUTABLES}) .PHONY: install-bundled-git ## Install bundled Git binaries. The target directory can be modified by ## setting PREFIX and DESTDIR. -install-bundled-git: install-bundled-git-v2.41 install-bundled-git-v2.42 +install-bundled-git: install-bundled-git-v2.41 install-bundled-git-v2.41: $(patsubst %,${INSTALL_DEST_DIR}/gitaly-%-v2.41,${GIT_EXECUTABLES}) -install-bundled-git-v2.42: $(patsubst %,${INSTALL_DEST_DIR}/gitaly-%-v2.42,${GIT_EXECUTABLES}) ifdef WITH_BUNDLED_GIT build: build-bundled-git @@ -582,10 +578,6 @@ ${BUILD_DIR}/bin/gitaly-%-v2.41: override GIT_VERSION = ${GIT_VERSION_2_41} ${BUILD_DIR}/bin/gitaly-%-v2.41: ${DEPENDENCY_DIR}/git-v2.41/% | ${BUILD_DIR}/bin ${Q}install $< $@ -${BUILD_DIR}/bin/gitaly-%-v2.42: override GIT_VERSION = ${GIT_VERSION_2_42} -${BUILD_DIR}/bin/gitaly-%-v2.42: ${DEPENDENCY_DIR}/git-v2.42/% | ${BUILD_DIR}/bin - ${Q}install $< $@ - ${BUILD_DIR}/bin/%: ${BUILD_DIR}/intermediate/% | ${BUILD_DIR}/bin @ # To compute a unique and deterministic value for GNU build-id, we use an @ # intermediate binary which has a fixed build ID of "TEMP_GITALY_BUILD_ID", diff --git a/internal/featureflag/ff_git_v242.go b/internal/featureflag/ff_git_v242.go deleted file mode 100644 index 20615dca0..000000000 --- a/internal/featureflag/ff_git_v242.go +++ /dev/null @@ -1,9 +0,0 @@ -package featureflag - -// GitV242 enables the use of Git v2.42. -var GitV242 = NewFeatureFlag( - "git_v242", - "v16.4.0", - "https://gitlab.com/gitlab-org/gitaly/-/issues/5539", - false, -) diff --git a/internal/git/execution_environment.go b/internal/git/execution_environment.go index c4f7608e5..e613020ff 100644 --- a/internal/git/execution_environment.go +++ b/internal/git/execution_environment.go @@ -25,13 +25,6 @@ var ( // case `IsEnabled()` returns `false` though. defaultExecutionEnvironmentConstructors = []ExecutionEnvironmentConstructor{ BundledGitEnvironmentConstructor{ - Suffix: "-v2.42", - FeatureFlags: []featureflag.FeatureFlag{ - featureflag.GitV242, - }, - }, - - BundledGitEnvironmentConstructor{ Suffix: "-v2.41", }, DistributedGitEnvironmentConstructor{}, diff --git a/internal/testhelper/testhelper.go b/internal/testhelper/testhelper.go index c7ddc601e..69e2f72f6 100644 --- a/internal/testhelper/testhelper.go +++ b/internal/testhelper/testhelper.go @@ -237,8 +237,6 @@ func ContextWithoutCancel(opts ...ContextOpt) context.Context { // Randomly enable mailmap ctx = featureflag.ContextWithFeatureFlag(ctx, featureflag.MailmapOptions, rand.Int()%2 == 0) - // Randomly enable either Git v2.41 or 2.42. - ctx = featureflag.ContextWithFeatureFlag(ctx, featureflag.GitV242, rand.Int()%2 == 0) for _, opt := range opts { ctx = opt(ctx) |