From e4bf47d149d4ad7ea6691324aa8b0d25d5e16227 Mon Sep 17 00:00:00 2001 From: John Cai Date: Tue, 13 Jun 2023 14:30:58 -0400 Subject: 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. --- packed_binaries.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'packed_binaries.go') 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. -- cgit v1.2.3