From c1e76bdd815e6410a6c5af9f23713eadb501e62d Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Fri, 24 Apr 2026 10:44:22 +0200 Subject: [PATCH] projects-dir.mk: Get with --create-remote-user-repos pgit.sh get is not invoked with --create-remote-user-repos by default. For the janware Git servers, this makes CI fail over new repos: Repos from the maintainers are pulled, but before pkg-rebuild-reinstall, repos that the devops user has no remote repo for are purged again and are subseqently missing during build. Passing --create-remote-user-repos to all pgit.sh get invocations should fix the problem, so do that. Signed-off-by: Jan Lindemann --- make/projects-dir.mk | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/make/projects-dir.mk b/make/projects-dir.mk index 132af1bc..0c2fe00c 100644 --- a/make/projects-dir.mk +++ b/make/projects-dir.mk @@ -126,19 +126,17 @@ ifneq ($(origin PROJECTS_DIR_REMOTE_BASE),undefined) PGIT_SH += --remote-base $(PROJECTS_DIR_REMOTE_BASE) endif PGIT_SH_GET := $(PGIT_SH) get -PGIT_SH_GET_DEFAULT = $(PGIT_SH_GET) $(PGIT_SH_OPTS_NETWORK) ifneq ($(JANWARE_USER),) PGIT_SH_OPTS_NETWORK += --login $(JANWARE_USER) + PGIT_SH_GET += $(PGIT_SH_OPTS_NETWORK) --create-remote-user-repos endif +PGIT_SH_GET_DEFAULT = $(PGIT_SH_GET) ifneq ($(CLONE_FROM_USER),) PGIT_SH_GET_DEFAULT += --refspec $(CLONE_FROM_USER):current-branch:current-branch endif ifneq ($(OFFLINE_PROJECTS),) export PGIT_IGNORE = $(OFFLINE_PROJECTS) endif -ifneq ($(JANWARE_USER),) - PGIT_SH_GET_DEFAULT += --create-remote-user-repos -endif PURGE_SH = /bin/bash $(firstword $(wildcard $(JWB_SCRIPT_DIR)/purge-stale-projects.sh $(JW_PKG_BINDIR)/purge-stale-projects.sh) purge-not-found) CREATE_PROJECT_SH ?= /bin/bash $(firstword $(wildcard $(JWB_SCRIPT_DIR)/jw-pkg-create-project.sh $(JW_PKG_BINDIR)/jw-pkg-create-project.sh) jw-pkg-create-project-not-found) @@ -351,7 +349,7 @@ git-get-official: $(SSH_WRAPPER_SH) PGIT_SH_PROJECTS="$(PROJECTS_WITH_PROJECT_CONF)" $(PGIT_SH) exec make $@ git-get-%: $(SSH_WRAPPER_SH) - $(PGIT_SH_GET) $(PGIT_SH_OPTS_NETWORK) --refspec "$*:master:current-branch" + $(PGIT_SH_GET) --refspec "$*:master:current-branch" git-show-non-master-branches: $(Q)$(PGIT_SH) --porcelain branch 2>&1 | \