diff options
author | John Cai <jcai@gitlab.com> | 2023-06-13 21:30:58 +0300 |
---|---|---|
committer | John Cai <jcai@gitlab.com> | 2023-06-20 18:10:53 +0300 |
commit | e4bf47d149d4ad7ea6691324aa8b0d25d5e16227 (patch) | |
tree | 27bc43e29fdee40a62c9f1eb86077e5504ce2c0c | |
parent | 704ada1b240c283c1ff73547e2dd8b1f69887765 (diff) |
pack gitaly-gpg into packed binary
While dc76390d6 (Enable gitaly-gpg to be built in bundled binary in
Makefile, 2023-06-09) added gitaly-gpg to the bundled binary in the
Makefile, there were a couple of places where we missed adding
gitaly-gpg so it gets recognized as a binary in the packed binaries
executable.
-rw-r--r-- | internal/gitaly/config/config.go | 1 | ||||
-rw-r--r-- | packed_binaries.go | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/internal/gitaly/config/config.go b/internal/gitaly/config/config.go index fdc1fcf0a..3854a9f63 100644 --- a/internal/gitaly/config/config.go +++ b/internal/gitaly/config/config.go @@ -662,6 +662,7 @@ var packedBinaries = map[string]struct{}{ "gitaly-ssh": {}, "gitaly-git2go": {}, "gitaly-lfs-smudge": {}, + "gitaly-gpg": {}, } // BinaryPath returns the path to a given binary. BinaryPath does not do any validation, it simply joins the binaryName diff --git a/packed_binaries.go b/packed_binaries.go index 0e14b98f5..1ae1a54a2 100644 --- a/packed_binaries.go +++ b/packed_binaries.go @@ -16,7 +16,7 @@ const buildDir = "_build/bin" // 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. // -//go:embed _build/bin/gitaly-hooks _build/bin/gitaly-ssh _build/bin/gitaly-git2go _build/bin/gitaly-lfs-smudge +//go:embed _build/bin/gitaly-hooks _build/bin/gitaly-ssh _build/bin/gitaly-git2go _build/bin/gitaly-lfs-smudge _build/bin/gitaly-gpg var packedBinariesFS embed.FS // UnpackAuxiliaryBinaries unpacks the packed auxiliary binaries of Gitaly into destination directory. |