From fe1338cf3a8d0788c0520e309c2de80e213275db Mon Sep 17 00:00:00 2001 From: James Liu Date: Fri, 18 Oct 2024 15:58:43 +1100 Subject: [PATCH 1/2] wip --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 1aacac7a18..ff5d7d3191 100644 --- a/Makefile +++ b/Makefile @@ -108,7 +108,7 @@ ifeq ($(origin PROTOC_BUILD_OPTIONS),undefined) endif # Git target -GIT_REPO_URL ?= https://gitlab.com/gitlab-org/git.git +GIT_REPO_URL ?= https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/gitlab-org/security/git.git GIT_QUIET := ifeq (${Q},@) GIT_QUIET = --quiet @@ -137,7 +137,7 @@ GIT_VERSION ?= # major version is added, be sure to update GIT_PACKED_EXECUTABLES, the *-bundled-git targets, # and add new targets under the "# These targets build specific releases of Git." section. GIT_VERSION_2_46 ?= v2.46.2 -GIT_VERSION_2_47 ?= v2.47.0 +GIT_VERSION_2_47 ?= v2.47.0-rc1 # # OVERRIDE_GIT_VERSION allows you to specify a custom semver value to be reported by the # `git --version` command. This affects bundled and non-bundled Git, and can be used whenever -- GitLab From 74eff7d177940e40bd5e3085a1b2eb7f3e3e2ffc Mon Sep 17 00:00:00 2001 From: James Liu Date: Mon, 21 Oct 2024 10:24:27 +1100 Subject: [PATCH 2/2] Revert "wip" This reverts commit fe1338cf3a8d0788c0520e309c2de80e213275db. --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index ff5d7d3191..1aacac7a18 100644 --- a/Makefile +++ b/Makefile @@ -108,7 +108,7 @@ ifeq ($(origin PROTOC_BUILD_OPTIONS),undefined) endif # Git target -GIT_REPO_URL ?= https://gitlab-ci-token:${CI_JOB_TOKEN}@gitlab.com/gitlab-org/security/git.git +GIT_REPO_URL ?= https://gitlab.com/gitlab-org/git.git GIT_QUIET := ifeq (${Q},@) GIT_QUIET = --quiet @@ -137,7 +137,7 @@ GIT_VERSION ?= # major version is added, be sure to update GIT_PACKED_EXECUTABLES, the *-bundled-git targets, # and add new targets under the "# These targets build specific releases of Git." section. GIT_VERSION_2_46 ?= v2.46.2 -GIT_VERSION_2_47 ?= v2.47.0-rc1 +GIT_VERSION_2_47 ?= v2.47.0 # # OVERRIDE_GIT_VERSION allows you to specify a custom semver value to be reported by the # `git --version` command. This affects bundled and non-bundled Git, and can be used whenever -- GitLab