diff options
Diffstat (limited to 'devel/gitaly')
| -rw-r--r-- | devel/gitaly/Makefile | 2 | ||||
| -rw-r--r-- | devel/gitaly/distinfo | 14 | ||||
| -rw-r--r-- | devel/gitaly/files/patch-Makefile | 21 | ||||
| -rw-r--r-- | devel/gitaly/files/patch-config.toml.example | 19 |
4 files changed, 11 insertions, 45 deletions
diff --git a/devel/gitaly/Makefile b/devel/gitaly/Makefile index 64bb1010af84..50b44de5e20d 100644 --- a/devel/gitaly/Makefile +++ b/devel/gitaly/Makefile @@ -25,9 +25,9 @@ CPE_VENDOR= gitlab USE_GITLAB= yes GL_ACCOUNT= gitlab-org +GL_TUPLE= gitlab-org:git:v${GITLAB_GIT_VERSION}:_build/_build/deps/git-v${GITLAB_GIT_VERSION_SHORT} GO_MOD_DIST= gitlab GO_MODULE= gitlab.com/gitlab-org/gitaly/v18 -GL_TUPLE= gitlab-org:git:v${GITLAB_GIT_VERSION}:_build/_build/deps/git-v${GITLAB_GIT_VERSION_SHORT} MAKE_ENV= GOFLAGS="${GO_BUILDFLAGS}" # make sure to pass go build options into make process diff --git a/devel/gitaly/distinfo b/devel/gitaly/distinfo index ccf599dc21c3..8549dcb6f367 100644 --- a/devel/gitaly/distinfo +++ b/devel/gitaly/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1752120719 -SHA256 (go/devel_gitaly/gitaly-v18.1.2/go.mod) = c0924eaae5b6c66c0e8d04e25e1dad85b88be0d33008524c3e6a9eca51311dcb -SIZE (go/devel_gitaly/gitaly-v18.1.2/go.mod) = 13011 -SHA256 (go/devel_gitaly/gitaly-v18.1.2/gitaly-v18.1.2.tar.bz2) = 8538f12c47dcb7ad3cd9c1bafe003d8e3f6fc2e26b10031f835af624d8c12c55 -SIZE (go/devel_gitaly/gitaly-v18.1.2/gitaly-v18.1.2.tar.bz2) = 4541124 -SHA256 (go/devel_gitaly/gitaly-v18.1.2/git-v2.49.0.tar.bz2) = 63678e3839f5af667b48cb9d0c37de4b249916dc19aae7c5ce83d07fb3146ecb -SIZE (go/devel_gitaly/gitaly-v18.1.2/git-v2.49.0.tar.bz2) = 9079092 +TIMESTAMP = 1756438000 +SHA256 (go/devel_gitaly/gitaly-v18.3.1/go.mod) = 163e0c24ae7263540250f58c84b9a0197cf6be768dab99b21dd463cc1a4659bc +SIZE (go/devel_gitaly/gitaly-v18.3.1/go.mod) = 13011 +SHA256 (go/devel_gitaly/gitaly-v18.3.1/gitaly-v18.3.1.tar.bz2) = 657b5405665f2e9112e251edde1c0db4da1f871ec53611f30bf6353c922cf6f4 +SIZE (go/devel_gitaly/gitaly-v18.3.1/gitaly-v18.3.1.tar.bz2) = 4558216 +SHA256 (go/devel_gitaly/gitaly-v18.3.1/git-v2.50.0.tar.bz2) = 33e44c038ae6b3ff526e6927c2c6ff1658fd7f3c7334b079c019fa08f8ab20e4 +SIZE (go/devel_gitaly/gitaly-v18.3.1/git-v2.50.0.tar.bz2) = 9249878 diff --git a/devel/gitaly/files/patch-Makefile b/devel/gitaly/files/patch-Makefile deleted file mode 100644 index 9345aecfdf54..000000000000 --- a/devel/gitaly/files/patch-Makefile +++ /dev/null @@ -1,21 +0,0 @@ ---- Makefile.orig 2025-05-14 17:37:06 UTC -+++ Makefile -@@ -717,12 +717,12 @@ ${DEPENDENCY_DIR}/git-%/Makefile: ${DEPENDENCY_DIR}/gi - # otherwise try to rebuild all targets depending on it whenever we build - # something else. We thus depend on the Makefile instead. - ${DEPENDENCY_DIR}/git-%/Makefile: ${DEPENDENCY_DIR}/git-%.version -- ${Q}${GIT} -c init.defaultBranch=master init ${GIT_QUIET} "${@D}" -- ${Q}${GIT} -C "${@D}" config remote.origin.url ${GIT_REPO_URL} -- ${Q}${GIT} -C "${@D}" config remote.origin.tagOpt --no-tags -- ${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 -+ #${Q}${GIT} -c init.defaultBranch=master init ${GIT_QUIET} "${@D}" -+ #${Q}${GIT} -C "${@D}" config remote.origin.url ${GIT_REPO_URL} -+ #${Q}${GIT} -C "${@D}" config remote.origin.tagOpt --no-tags -+ #${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 - ifeq ($(OVERRIDE_GIT_VERSION),) - ${Q}rm -f "${@D}"/version - else diff --git a/devel/gitaly/files/patch-config.toml.example b/devel/gitaly/files/patch-config.toml.example index 4303af905b5a..47441eb79518 100644 --- a/devel/gitaly/files/patch-config.toml.example +++ b/devel/gitaly/files/patch-config.toml.example @@ -1,4 +1,4 @@ ---- config.toml.example.orig 2025-04-16 03:58:04 UTC +--- config.toml.example.orig 2025-08-20 06:37:58 UTC +++ config.toml.example @@ -2,10 +2,10 @@ # For Gitaly documentation, see https://docs.gitlab.com/administration/gitaly/. @@ -13,20 +13,7 @@ # # Optional. The directory where Gitaly can create all files required to # # properly operate at runtime. If not set, Gitaly will create a directory in -@@ -42,9 +42,9 @@ bin_dir = "/home/git/gitaly/_build/bin" - # min_version = "TLS 1.2" - - # # Git settings --# [git] --# # Path to Git binary. If not set, is resolved using PATH. --# bin_path = "/usr/bin/git" -+[git] -+# Path to Git binary. If not set, is resolved using PATH. -+bin_path = "%%PREFIX%%/bin/git" - # # Maximum number of cached 'cat-file' processes, which constitute a pair of 'git cat-file --batch' and - # # 'git cat-file --batch-check' processes. Defaults to '100'. - # catfile_cache_size = 100 -@@ -60,7 +60,7 @@ name = "default" +@@ -58,7 +58,7 @@ name = "default" # # The name of the storage name = "default" # # The path to the storage. @@ -35,7 +22,7 @@ # # You can optionally configure more storages for this Gitaly instance to serve up # -@@ -91,18 +91,18 @@ sentry_environment = "" +@@ -89,18 +89,18 @@ sentry_environment = "" # # Custom Git hooks that are used to perform tasks based on changes performed in any repository. [hooks] # # Directory where custom Git hooks are installed. If left unset, no custom hooks are used. |