janware/jw-pkg
1
Code Pull requests Activity Actions

projects-dir.mk: Get with --create-remote-user-repos

Browse source 
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 <jan@janware.com>
This commit is contained in:
Jan Lindemann 2026-04-24 10:44:22 +02:00 • committed by janware DevOps
commit c1e76bdd81
1 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
make/projects-dir.mk
View file

@ -126,19 +126,17 @@ ifneq ($(origin PROJECTS_DIR_REMOTE_BASE),undefined)
PGIT_SH += --remote-base $(PROJECTS_DIR_REMOTE_BASE) PGIT_SH += --remote-base $(PROJECTS_DIR_REMOTE_BASE)
endif endif
PGIT_SH_GET := $(PGIT_SH) get PGIT_SH_GET := $(PGIT_SH) get
PGIT_SH_GET_DEFAULT = $(PGIT_SH_GET) $(PGIT_SH_OPTS_NETWORK)
ifneq ($(JANWARE_USER),) ifneq ($(JANWARE_USER),)
PGIT_SH_OPTS_NETWORK += --login $(JANWARE_USER) PGIT_SH_OPTS_NETWORK += --login $(JANWARE_USER)
PGIT_SH_GET += $(PGIT_SH_OPTS_NETWORK) --create-remote-user-repos
endif endif
PGIT_SH_GET_DEFAULT = $(PGIT_SH_GET)
ifneq ($(CLONE_FROM_USER),) ifneq ($(CLONE_FROM_USER),)
PGIT_SH_GET_DEFAULT += --refspec $(CLONE_FROM_USER):current-branch:current-branch PGIT_SH_GET_DEFAULT += --refspec $(CLONE_FROM_USER):current-branch:current-branch
endif endif
ifneq ($(OFFLINE_PROJECTS),) ifneq ($(OFFLINE_PROJECTS),)
export PGIT_IGNORE = $(OFFLINE_PROJECTS) export PGIT_IGNORE = $(OFFLINE_PROJECTS)
endif 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) 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) 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 $@ PGIT_SH_PROJECTS="$(PROJECTS_WITH_PROJECT_CONF)" $(PGIT_SH) exec make $@
git-get-%: $(SSH_WRAPPER_SH) 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: git-show-non-master-branches:
$(Q)$(PGIT_SH) --porcelain branch 2>&1 | \ $(Q)$(PGIT_SH) --porcelain branch 2>&1 | \