From b038baf668a1c164b717a22203c536d53b1a5a8e Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Thu, 14 May 2026 12:37:34 +0200 Subject: [PATCH] topdir.mk / projects-dir.mk: Add get-pub Add get-pub for top directory / projects directory level. This is a janware specific target needed for CI. It integrates the current master branch from the new Forgejo-based Git repos. That said, this will likely need to go along with other release machinery. Packaging is good, but releasing over a bunch of directories is an intricate process, as-is only usable by janware itself, and doesn't need to be part of jw-pkg. Signed-off-by: Jan Lindemann --- make/projects-dir.mk | 4 ++++ make/topdir.mk | 6 ++++++ 2 files changed, 10 insertions(+) diff --git a/make/projects-dir.mk b/make/projects-dir.mk index 62e9bd0b..683570b9 100644 --- a/make/projects-dir.mk +++ b/make/projects-dir.mk @@ -312,6 +312,7 @@ diff-all diff: $(SSH_WRAPPER_SH) get-official: git-get-official get-maintainer: git-get-maintainer +get-pub: git-get-pub get-%: git-get-% @: @@ -345,6 +346,9 @@ git-pull-all: $(SSH_WRAPPER_SH) git-get-maintainer: $(SSH_WRAPPER_SH) PGIT_SH_PROJECTS="$(PROJECTS_WITH_PROJECT_CONF)" $(PGIT_SH) exec make $@ +git-get-pub: + PGIT_SH_PROJECTS="$(PROJECTS_WITH_PROJECT_CONF)" $(PGIT_SH) exec make $@ + git-get-official: $(SSH_WRAPPER_SH) PGIT_SH_PROJECTS="$(PROJECTS_WITH_PROJECT_CONF)" $(PGIT_SH) exec make $@ diff --git a/make/topdir.mk b/make/topdir.mk index 03b012b8..44084bb2 100644 --- a/make/topdir.mk +++ b/make/topdir.mk @@ -135,6 +135,7 @@ install-links: get-maintainer: git-get-maintainer get-official: git-get-official +get-pub: git-get-pub git-init: git-init.done $(GIT_DESCR) @@ -206,6 +207,11 @@ git-get-official: git-get-maintainer: make git-get-$(call proj_query,getval global jw-maintainer) +git-get-pub: + if git remote | grep -q "^pub$$"; then \ + git pull pub master ;\ + fi + git-get-%: PGIT_SH_PROJECTS=. $(PGIT_SH) get --refspec $*:$(GIT_MAIN_BRANCH):current-branch