diff options
author | Sami Hiltunen <shiltunen@gitlab.com> | 2022-08-03 08:29:42 +0300 |
---|---|---|
committer | Sami Hiltunen <shiltunen@gitlab.com> | 2022-08-03 08:29:42 +0300 |
commit | 30c010ce568c2e387728658b752fd65ee4f2a926 (patch) | |
tree | 683a68a98b5f0cc02bbc4ddaac5b3422d009178d | |
parent | b799d0b98f26e3de2fc408bf2b83eb86fb330858 (diff) | |
parent | b42e3c04b00552a84c104e06e8f0d3bc5194f0d7 (diff) |
Merge branch 'smh-dont-install-aux-binaries' into 'master'
Stop installing packed binaries
See merge request gitlab-org/gitaly!4673
-rw-r--r-- | Makefile | 26 | ||||
-rw-r--r-- | cmd/gitaly-git2go/apply.go (renamed from cmd/gitaly-git2go-v15/apply.go) | 2 | ||||
-rw-r--r-- | cmd/gitaly-git2go/cherry_pick.go (renamed from cmd/gitaly-git2go-v15/cherry_pick.go) | 2 | ||||
-rw-r--r-- | cmd/gitaly-git2go/cherry_pick_test.go (renamed from cmd/gitaly-git2go-v15/cherry_pick_test.go) | 2 | ||||
-rw-r--r-- | cmd/gitaly-git2go/commit.go (renamed from cmd/gitaly-git2go-v15/commit.go) | 2 | ||||
-rw-r--r-- | cmd/gitaly-git2go/commit/change_file_mode.go (renamed from cmd/gitaly-git2go-v15/commit/change_file_mode.go) | 0 | ||||
-rw-r--r-- | cmd/gitaly-git2go/commit/commit.go (renamed from cmd/gitaly-git2go-v15/commit/commit.go) | 2 | ||||
-rw-r--r-- | cmd/gitaly-git2go/commit/create_directory.go (renamed from cmd/gitaly-git2go-v15/commit/create_directory.go) | 0 | ||||
-rw-r--r-- | cmd/gitaly-git2go/commit/create_file.go (renamed from cmd/gitaly-git2go-v15/commit/create_file.go) | 0 | ||||
-rw-r--r-- | cmd/gitaly-git2go/commit/delete_file.go (renamed from cmd/gitaly-git2go-v15/commit/delete_file.go) | 0 | ||||
-rw-r--r-- | cmd/gitaly-git2go/commit/move_file.go (renamed from cmd/gitaly-git2go-v15/commit/move_file.go) | 0 | ||||
-rw-r--r-- | cmd/gitaly-git2go/commit/update_file.go (renamed from cmd/gitaly-git2go-v15/commit/update_file.go) | 0 | ||||
-rw-r--r-- | cmd/gitaly-git2go/commit/validate.go (renamed from cmd/gitaly-git2go-v15/commit/validate.go) | 0 | ||||
-rw-r--r-- | cmd/gitaly-git2go/conflicts.go (renamed from cmd/gitaly-git2go-v15/conflicts.go) | 2 | ||||
-rw-r--r-- | cmd/gitaly-git2go/conflicts_test.go (renamed from cmd/gitaly-git2go-v15/conflicts_test.go) | 0 | ||||
-rw-r--r-- | cmd/gitaly-git2go/featureflags.go (renamed from cmd/gitaly-git2go-v15/featureflags.go) | 0 | ||||
-rw-r--r-- | cmd/gitaly-git2go/git2goutil/repo.go (renamed from cmd/gitaly-git2go-v15/git2goutil/repo.go) | 0 | ||||
-rw-r--r-- | cmd/gitaly-git2go/main.go (renamed from cmd/gitaly-git2go-v15/main.go) | 0 | ||||
-rw-r--r-- | cmd/gitaly-git2go/merge.go (renamed from cmd/gitaly-git2go-v15/merge.go) | 2 | ||||
-rw-r--r-- | cmd/gitaly-git2go/merge_test.go (renamed from cmd/gitaly-git2go-v15/merge_test.go) | 2 | ||||
-rw-r--r-- | cmd/gitaly-git2go/rebase.go (renamed from cmd/gitaly-git2go-v15/rebase.go) | 2 | ||||
-rw-r--r-- | cmd/gitaly-git2go/rebase_test.go (renamed from cmd/gitaly-git2go-v15/rebase_test.go) | 2 | ||||
-rw-r--r-- | cmd/gitaly-git2go/resolve_conflicts.go (renamed from cmd/gitaly-git2go-v15/resolve_conflicts.go) | 2 | ||||
-rw-r--r-- | cmd/gitaly-git2go/revert.go (renamed from cmd/gitaly-git2go-v15/revert.go) | 2 | ||||
-rw-r--r-- | cmd/gitaly-git2go/revert_test.go (renamed from cmd/gitaly-git2go-v15/revert_test.go) | 2 | ||||
-rw-r--r-- | cmd/gitaly-git2go/submodule.go (renamed from cmd/gitaly-git2go-v15/submodule.go) | 2 | ||||
-rw-r--r-- | cmd/gitaly-git2go/submodule_test.go (renamed from cmd/gitaly-git2go-v15/submodule_test.go) | 0 | ||||
-rw-r--r-- | cmd/gitaly-git2go/testhelper_test.go (renamed from cmd/gitaly-git2go-v15/testhelper_test.go) | 0 | ||||
-rw-r--r-- | cmd/gitaly-git2go/util.go (renamed from cmd/gitaly-git2go-v15/util.go) | 0 | ||||
-rw-r--r-- | internal/git2go/executor.go | 4 | ||||
-rw-r--r-- | internal/gitaly/config/config.go | 2 | ||||
-rw-r--r-- | internal/testhelper/testcfg/build.go | 2 | ||||
-rw-r--r-- | packed_binaries.go | 2 |
33 files changed, 28 insertions, 36 deletions
@@ -252,11 +252,13 @@ TEST_REPO_GIT := ${TEST_REPO_DIR}/gitlab-git-test.git BENCHMARK_REPO := ${TEST_REPO_DIR}/benchmark.git # All executables provided by Gitaly. -GITALY_EXECUTABLES = $(addprefix ${BUILD_DIR}/bin/,$(notdir $(shell find ${SOURCE_DIR}/cmd -mindepth 1 -maxdepth 1 -type d -print)) gitaly-git2go-v14) +GITALY_EXECUTABLES = $(addprefix ${BUILD_DIR}/bin/,$(notdir $(shell find ${SOURCE_DIR}/cmd -mindepth 1 -maxdepth 1 -type d -print))) # All executables packed inside the Gitaly binary. -GITALY_PACKED_EXECUTABLES = $(filter %gitaly-hooks %gitaly-git2go-v15 %gitaly-ssh %gitaly-lfs-smudge, ${GITALY_EXECUTABLES}) +GITALY_PACKED_EXECUTABLES = $(filter %gitaly-hooks %gitaly-git2go %gitaly-ssh %gitaly-lfs-smudge, ${GITALY_EXECUTABLES}) +# All executables that should be installed. +GITALY_INSTALLED_EXECUTABLES = $(filter-out ${GITALY_PACKED_EXECUTABLES}, ${GITALY_EXECUTABLES}) # Find all Go source files. -find_go_sources = $(shell find ${SOURCE_DIR} -type d \( -name ruby -o -name vendor -o -name testdata -o -name '_*' -o -path '*/proto/go/gitalypb' \) -prune -o -type f -name '*.go' -not -name '*.pb.go' -print | sort -u) +find_go_sources = $(shell find ${SOURCE_DIR} -type d \( -name ruby -o -name vendor -o -name testdata -o -name '_*' -o -path '*/proto/go/gitalypb' \) -prune -o -type f -name '*.go' -not -name '*.pb.go' -print | sort -u) # run_go_tests will execute Go tests with all required parameters. Its # behaviour can be modified via the following variables: @@ -329,13 +331,13 @@ help: .PHONY: build ## Build Go binaries and install required Ruby Gems. -build: ${SOURCE_DIR}/.ruby-bundle ${GITALY_EXECUTABLES} +build: ${SOURCE_DIR}/.ruby-bundle ${GITALY_INSTALLED_EXECUTABLES} .PHONY: install ## Install Gitaly binaries. The target directory can be modified by setting PREFIX and DESTDIR. install: build ${Q}mkdir -p ${INSTALL_DEST_DIR} - install ${GITALY_EXECUTABLES} "${INSTALL_DEST_DIR}" + install ${GITALY_INSTALLED_EXECUTABLES} "${INSTALL_DEST_DIR}" .PHONY: build-bundled-git ## Build bundled Git binaries. @@ -621,24 +623,14 @@ clear-go-build-cache-if-needed: ${BUILD_DIR}/intermediate/gitaly: GO_BUILD_TAGS = ${SERVER_BUILD_TAGS} ${BUILD_DIR}/intermediate/gitaly: remove-legacy-go-mod ${GITALY_PACKED_EXECUTABLES} ${BUILD_DIR}/intermediate/praefect: GO_BUILD_TAGS = ${SERVER_BUILD_TAGS} -${BUILD_DIR}/intermediate/gitaly-git2go-v15: GO_BUILD_TAGS = ${GIT2GO_BUILD_TAGS} -${BUILD_DIR}/intermediate/gitaly-git2go-v15: libgit2 +${BUILD_DIR}/intermediate/gitaly-git2go: GO_BUILD_TAGS = ${GIT2GO_BUILD_TAGS} +${BUILD_DIR}/intermediate/gitaly-git2go: libgit2 ${BUILD_DIR}/intermediate/%: clear-go-build-cache-if-needed .FORCE @ # We're building intermediate binaries first which contain a fixed build ID @ # of "TEMP_GITALY_BUILD_ID". In the final binary we replace this build ID with @ # the computed build ID for this binary. ${Q}go build -o "$@" -ldflags '-B 0x${TEMPORARY_BUILD_ID} ${GO_LDFLAGS}' -tags "${GO_BUILD_TAGS}" $(addprefix ${SOURCE_DIR}/cmd/,$(@F)) -# This target is required for backwards compatibility during zero-downtime -# upgrades and can be removed when v15.0 has been released. -${BUILD_DIR}/intermediate/gitaly-git2go-v14: GO_BUILD_TAGS = ${GIT2GO_BUILD_TAGS} -${BUILD_DIR}/intermediate/gitaly-git2go-v14: libgit2 -${BUILD_DIR}/intermediate/gitaly-git2go-v14: .FORCE - @ # gitaly-git2go-v14 pulls directly from a commit sha so that the gitaly-git2go-v14 - @ # binary can continue to be installed for the sake of zero downtime - @ # upgrades. - ${Q}GOBIN="$(dir $@)" go install -ldflags '-B 0x${TEMPORARY_BUILD_ID} ${GO_LDFLAGS}' -tags "${GO_BUILD_TAGS}" "gitlab.com/gitlab-org/gitaly/v14/cmd/gitaly-git2go-v14@c7c7c936c302ab435a0a56fbc19cfbd9bea0c835" - # This is a build hack to avoid excessive rebuilding of targets. Instead of # depending on the Makefile, we start to depend on tool versions as defined in # the Makefile. Like this, we only rebuild if the tool versions actually diff --git a/cmd/gitaly-git2go-v15/apply.go b/cmd/gitaly-git2go/apply.go index 2bd20b631..3a7f65b79 100644 --- a/cmd/gitaly-git2go-v15/apply.go +++ b/cmd/gitaly-git2go/apply.go @@ -15,7 +15,7 @@ import ( "path/filepath" git "github.com/libgit2/git2go/v33" - "gitlab.com/gitlab-org/gitaly/v15/cmd/gitaly-git2go-v15/git2goutil" + "gitlab.com/gitlab-org/gitaly/v15/cmd/gitaly-git2go/git2goutil" "gitlab.com/gitlab-org/gitaly/v15/internal/git2go" ) diff --git a/cmd/gitaly-git2go-v15/cherry_pick.go b/cmd/gitaly-git2go/cherry_pick.go index 5ebbb26b0..ebf29759f 100644 --- a/cmd/gitaly-git2go-v15/cherry_pick.go +++ b/cmd/gitaly-git2go/cherry_pick.go @@ -10,7 +10,7 @@ import ( "fmt" git "github.com/libgit2/git2go/v33" - "gitlab.com/gitlab-org/gitaly/v15/cmd/gitaly-git2go-v15/git2goutil" + "gitlab.com/gitlab-org/gitaly/v15/cmd/gitaly-git2go/git2goutil" "gitlab.com/gitlab-org/gitaly/v15/internal/git2go" ) diff --git a/cmd/gitaly-git2go-v15/cherry_pick_test.go b/cmd/gitaly-git2go/cherry_pick_test.go index 129476451..4522f3d94 100644 --- a/cmd/gitaly-git2go-v15/cherry_pick_test.go +++ b/cmd/gitaly-git2go/cherry_pick_test.go @@ -9,7 +9,7 @@ import ( git "github.com/libgit2/git2go/v33" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v15/cmd/gitaly-git2go-v15/git2goutil" + "gitlab.com/gitlab-org/gitaly/v15/cmd/gitaly-git2go/git2goutil" "gitlab.com/gitlab-org/gitaly/v15/internal/git/gittest" "gitlab.com/gitlab-org/gitaly/v15/internal/git2go" "gitlab.com/gitlab-org/gitaly/v15/internal/testhelper" diff --git a/cmd/gitaly-git2go-v15/commit.go b/cmd/gitaly-git2go/commit.go index e6789e424..cd0a1a31d 100644 --- a/cmd/gitaly-git2go-v15/commit.go +++ b/cmd/gitaly-git2go/commit.go @@ -7,7 +7,7 @@ import ( "encoding/gob" "flag" - "gitlab.com/gitlab-org/gitaly/v15/cmd/gitaly-git2go-v15/commit" + "gitlab.com/gitlab-org/gitaly/v15/cmd/gitaly-git2go/commit" ) type commitSubcommand struct{} diff --git a/cmd/gitaly-git2go-v15/commit/change_file_mode.go b/cmd/gitaly-git2go/commit/change_file_mode.go index e07db9ba4..e07db9ba4 100644 --- a/cmd/gitaly-git2go-v15/commit/change_file_mode.go +++ b/cmd/gitaly-git2go/commit/change_file_mode.go diff --git a/cmd/gitaly-git2go-v15/commit/commit.go b/cmd/gitaly-git2go/commit/commit.go index 43a07d012..57ca1f586 100644 --- a/cmd/gitaly-git2go-v15/commit/commit.go +++ b/cmd/gitaly-git2go/commit/commit.go @@ -9,7 +9,7 @@ import ( "fmt" git "github.com/libgit2/git2go/v33" - "gitlab.com/gitlab-org/gitaly/v15/cmd/gitaly-git2go-v15/git2goutil" + "gitlab.com/gitlab-org/gitaly/v15/cmd/gitaly-git2go/git2goutil" "gitlab.com/gitlab-org/gitaly/v15/internal/git2go" ) diff --git a/cmd/gitaly-git2go-v15/commit/create_directory.go b/cmd/gitaly-git2go/commit/create_directory.go index 061666ed3..061666ed3 100644 --- a/cmd/gitaly-git2go-v15/commit/create_directory.go +++ b/cmd/gitaly-git2go/commit/create_directory.go diff --git a/cmd/gitaly-git2go-v15/commit/create_file.go b/cmd/gitaly-git2go/commit/create_file.go index 926916561..926916561 100644 --- a/cmd/gitaly-git2go-v15/commit/create_file.go +++ b/cmd/gitaly-git2go/commit/create_file.go diff --git a/cmd/gitaly-git2go-v15/commit/delete_file.go b/cmd/gitaly-git2go/commit/delete_file.go index a5af77b7b..a5af77b7b 100644 --- a/cmd/gitaly-git2go-v15/commit/delete_file.go +++ b/cmd/gitaly-git2go/commit/delete_file.go diff --git a/cmd/gitaly-git2go-v15/commit/move_file.go b/cmd/gitaly-git2go/commit/move_file.go index b31853c96..b31853c96 100644 --- a/cmd/gitaly-git2go-v15/commit/move_file.go +++ b/cmd/gitaly-git2go/commit/move_file.go diff --git a/cmd/gitaly-git2go-v15/commit/update_file.go b/cmd/gitaly-git2go/commit/update_file.go index cea5d629b..cea5d629b 100644 --- a/cmd/gitaly-git2go-v15/commit/update_file.go +++ b/cmd/gitaly-git2go/commit/update_file.go diff --git a/cmd/gitaly-git2go-v15/commit/validate.go b/cmd/gitaly-git2go/commit/validate.go index ab3f972b1..ab3f972b1 100644 --- a/cmd/gitaly-git2go-v15/commit/validate.go +++ b/cmd/gitaly-git2go/commit/validate.go diff --git a/cmd/gitaly-git2go-v15/conflicts.go b/cmd/gitaly-git2go/conflicts.go index c29f729df..1e2fbb4e0 100644 --- a/cmd/gitaly-git2go-v15/conflicts.go +++ b/cmd/gitaly-git2go/conflicts.go @@ -10,7 +10,7 @@ import ( "fmt" git "github.com/libgit2/git2go/v33" - "gitlab.com/gitlab-org/gitaly/v15/cmd/gitaly-git2go-v15/git2goutil" + "gitlab.com/gitlab-org/gitaly/v15/cmd/gitaly-git2go/git2goutil" "gitlab.com/gitlab-org/gitaly/v15/internal/git2go" "gitlab.com/gitlab-org/gitaly/v15/internal/helper" "google.golang.org/grpc/codes" diff --git a/cmd/gitaly-git2go-v15/conflicts_test.go b/cmd/gitaly-git2go/conflicts_test.go index c8e9848eb..c8e9848eb 100644 --- a/cmd/gitaly-git2go-v15/conflicts_test.go +++ b/cmd/gitaly-git2go/conflicts_test.go diff --git a/cmd/gitaly-git2go-v15/featureflags.go b/cmd/gitaly-git2go/featureflags.go index 720320901..720320901 100644 --- a/cmd/gitaly-git2go-v15/featureflags.go +++ b/cmd/gitaly-git2go/featureflags.go diff --git a/cmd/gitaly-git2go-v15/git2goutil/repo.go b/cmd/gitaly-git2go/git2goutil/repo.go index 259da77e8..259da77e8 100644 --- a/cmd/gitaly-git2go-v15/git2goutil/repo.go +++ b/cmd/gitaly-git2go/git2goutil/repo.go diff --git a/cmd/gitaly-git2go-v15/main.go b/cmd/gitaly-git2go/main.go index e8a2c2c7b..e8a2c2c7b 100644 --- a/cmd/gitaly-git2go-v15/main.go +++ b/cmd/gitaly-git2go/main.go diff --git a/cmd/gitaly-git2go-v15/merge.go b/cmd/gitaly-git2go/merge.go index 3a1d8bfb8..4ab3ef9fd 100644 --- a/cmd/gitaly-git2go-v15/merge.go +++ b/cmd/gitaly-git2go/merge.go @@ -11,7 +11,7 @@ import ( "time" git "github.com/libgit2/git2go/v33" - "gitlab.com/gitlab-org/gitaly/v15/cmd/gitaly-git2go-v15/git2goutil" + "gitlab.com/gitlab-org/gitaly/v15/cmd/gitaly-git2go/git2goutil" "gitlab.com/gitlab-org/gitaly/v15/internal/git2go" ) diff --git a/cmd/gitaly-git2go-v15/merge_test.go b/cmd/gitaly-git2go/merge_test.go index 00c3b0ee3..aedc6e9bf 100644 --- a/cmd/gitaly-git2go-v15/merge_test.go +++ b/cmd/gitaly-git2go/merge_test.go @@ -10,7 +10,7 @@ import ( libgit2 "github.com/libgit2/git2go/v33" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v15/cmd/gitaly-git2go-v15/git2goutil" + "gitlab.com/gitlab-org/gitaly/v15/cmd/gitaly-git2go/git2goutil" "gitlab.com/gitlab-org/gitaly/v15/internal/git" "gitlab.com/gitlab-org/gitaly/v15/internal/git/gittest" "gitlab.com/gitlab-org/gitaly/v15/internal/git2go" diff --git a/cmd/gitaly-git2go-v15/rebase.go b/cmd/gitaly-git2go/rebase.go index e2cc3022f..b0638c72e 100644 --- a/cmd/gitaly-git2go-v15/rebase.go +++ b/cmd/gitaly-git2go/rebase.go @@ -10,7 +10,7 @@ import ( "fmt" git "github.com/libgit2/git2go/v33" - "gitlab.com/gitlab-org/gitaly/v15/cmd/gitaly-git2go-v15/git2goutil" + "gitlab.com/gitlab-org/gitaly/v15/cmd/gitaly-git2go/git2goutil" "gitlab.com/gitlab-org/gitaly/v15/internal/git2go" ) diff --git a/cmd/gitaly-git2go-v15/rebase_test.go b/cmd/gitaly-git2go/rebase_test.go index 38de7af42..54ca7b137 100644 --- a/cmd/gitaly-git2go-v15/rebase_test.go +++ b/cmd/gitaly-git2go/rebase_test.go @@ -9,7 +9,7 @@ import ( git "github.com/libgit2/git2go/v33" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v15/cmd/gitaly-git2go-v15/git2goutil" + "gitlab.com/gitlab-org/gitaly/v15/cmd/gitaly-git2go/git2goutil" gitalygit "gitlab.com/gitlab-org/gitaly/v15/internal/git" "gitlab.com/gitlab-org/gitaly/v15/internal/git/gittest" "gitlab.com/gitlab-org/gitaly/v15/internal/git2go" diff --git a/cmd/gitaly-git2go-v15/resolve_conflicts.go b/cmd/gitaly-git2go/resolve_conflicts.go index aa6159262..73062eb17 100644 --- a/cmd/gitaly-git2go-v15/resolve_conflicts.go +++ b/cmd/gitaly-git2go/resolve_conflicts.go @@ -13,7 +13,7 @@ import ( "time" git "github.com/libgit2/git2go/v33" - "gitlab.com/gitlab-org/gitaly/v15/cmd/gitaly-git2go-v15/git2goutil" + "gitlab.com/gitlab-org/gitaly/v15/cmd/gitaly-git2go/git2goutil" "gitlab.com/gitlab-org/gitaly/v15/internal/git/conflict" "gitlab.com/gitlab-org/gitaly/v15/internal/git2go" ) diff --git a/cmd/gitaly-git2go-v15/revert.go b/cmd/gitaly-git2go/revert.go index 9c66c4865..aaeeb00ac 100644 --- a/cmd/gitaly-git2go-v15/revert.go +++ b/cmd/gitaly-git2go/revert.go @@ -10,7 +10,7 @@ import ( "fmt" git "github.com/libgit2/git2go/v33" - "gitlab.com/gitlab-org/gitaly/v15/cmd/gitaly-git2go-v15/git2goutil" + "gitlab.com/gitlab-org/gitaly/v15/cmd/gitaly-git2go/git2goutil" "gitlab.com/gitlab-org/gitaly/v15/internal/git2go" ) diff --git a/cmd/gitaly-git2go-v15/revert_test.go b/cmd/gitaly-git2go/revert_test.go index 35a603ba9..cdd8bd6f9 100644 --- a/cmd/gitaly-git2go-v15/revert_test.go +++ b/cmd/gitaly-git2go/revert_test.go @@ -10,7 +10,7 @@ import ( git "github.com/libgit2/git2go/v33" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" - "gitlab.com/gitlab-org/gitaly/v15/cmd/gitaly-git2go-v15/git2goutil" + "gitlab.com/gitlab-org/gitaly/v15/cmd/gitaly-git2go/git2goutil" "gitlab.com/gitlab-org/gitaly/v15/internal/git/gittest" "gitlab.com/gitlab-org/gitaly/v15/internal/git2go" "gitlab.com/gitlab-org/gitaly/v15/internal/gitaly/config" diff --git a/cmd/gitaly-git2go-v15/submodule.go b/cmd/gitaly-git2go/submodule.go index 3c2f2e0eb..0e52ee3f4 100644 --- a/cmd/gitaly-git2go-v15/submodule.go +++ b/cmd/gitaly-git2go/submodule.go @@ -10,7 +10,7 @@ import ( "time" git "github.com/libgit2/git2go/v33" - "gitlab.com/gitlab-org/gitaly/v15/cmd/gitaly-git2go-v15/git2goutil" + "gitlab.com/gitlab-org/gitaly/v15/cmd/gitaly-git2go/git2goutil" "gitlab.com/gitlab-org/gitaly/v15/internal/git2go" ) diff --git a/cmd/gitaly-git2go-v15/submodule_test.go b/cmd/gitaly-git2go/submodule_test.go index 7e6c2a5bd..7e6c2a5bd 100644 --- a/cmd/gitaly-git2go-v15/submodule_test.go +++ b/cmd/gitaly-git2go/submodule_test.go diff --git a/cmd/gitaly-git2go-v15/testhelper_test.go b/cmd/gitaly-git2go/testhelper_test.go index 274687cb6..274687cb6 100644 --- a/cmd/gitaly-git2go-v15/testhelper_test.go +++ b/cmd/gitaly-git2go/testhelper_test.go diff --git a/cmd/gitaly-git2go-v15/util.go b/cmd/gitaly-git2go/util.go index 7a94371c3..7a94371c3 100644 --- a/cmd/gitaly-git2go-v15/util.go +++ b/cmd/gitaly-git2go/util.go diff --git a/internal/git2go/executor.go b/internal/git2go/executor.go index 9524f03b1..30c8ff0a3 100644 --- a/internal/git2go/executor.go +++ b/internal/git2go/executor.go @@ -24,8 +24,8 @@ var ( // ErrInvalidArgument is returned in case the merge arguments are invalid. ErrInvalidArgument = errors.New("invalid parameters") - // BinaryName is a binary name with version suffix . - BinaryName = "gitaly-git2go-v15" + // BinaryName is the name of the gitaly-git2go binary. + BinaryName = "gitaly-git2go" ) // Executor executes gitaly-git2go. diff --git a/internal/gitaly/config/config.go b/internal/gitaly/config/config.go index 0e458b0ba..bba1e7d40 100644 --- a/internal/gitaly/config/config.go +++ b/internal/gitaly/config/config.go @@ -290,7 +290,7 @@ func validateIsDirectory(path, name string) error { var packedBinaries = map[string]struct{}{ "gitaly-hooks": {}, "gitaly-ssh": {}, - "gitaly-git2go-v15": {}, + "gitaly-git2go": {}, "gitaly-lfs-smudge": {}, } diff --git a/internal/testhelper/testcfg/build.go b/internal/testhelper/testcfg/build.go index ffacd17cb..d1d9e7a8b 100644 --- a/internal/testhelper/testcfg/build.go +++ b/internal/testhelper/testcfg/build.go @@ -21,7 +21,7 @@ var buildOnceByName sync.Map // BuildGitalyGit2Go builds the gitaly-git2go command and installs it into the binary directory. func BuildGitalyGit2Go(t testing.TB, cfg config.Cfg) string { - return buildGitalyCommand(t, cfg, "gitaly-git2go-v15") + return buildGitalyCommand(t, cfg, "gitaly-git2go") } // BuildGitalyWrapper builds the gitaly-wrapper command and installs it into the binary directory. diff --git a/packed_binaries.go b/packed_binaries.go index 16c02f2e4..fe3e435e0 100644 --- a/packed_binaries.go +++ b/packed_binaries.go @@ -11,7 +11,7 @@ import ( // buildDir is the directory path where our build target places the built binaries. const buildDir = "_build/bin" -//go:embed _build/bin/gitaly-hooks _build/bin/gitaly-ssh _build/bin/gitaly-git2go-v15 _build/bin/gitaly-lfs-smudge +//go:embed _build/bin/gitaly-hooks _build/bin/gitaly-ssh _build/bin/gitaly-git2go _build/bin/gitaly-lfs-smudge // // packedBinariesFS contains embedded binaries. If you modify the above embeddings, you must also update // GITALY_PACKED_EXECUTABLES in Makefile and packedBinaries in internal/gitaly/config/config.go. |