From 24c1c0f201351ba6c23c46eb1a6e024c3e040d52 Mon Sep 17 00:00:00 2001 From: Carlos Vega Date: Wed, 6 Sep 2023 08:55:11 +0200 Subject: [PATCH 1/3] Add custom branch name to publish artifact Signed-off-by: Carlos Vega --- makelib/xpkg.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/makelib/xpkg.mk b/makelib/xpkg.mk index b8d19f4..e7a5111 100644 --- a/makelib/xpkg.mk +++ b/makelib/xpkg.mk @@ -118,7 +118,7 @@ endif # only publish package for main / master and release branches # TODO(hasheddan): remove master and support overriding -ifneq ($(filter main master release-%,$(BRANCH_NAME)),) +ifneq ($(filter main master release-% $(CUSTOM_BRANCH_NAME),$(BRANCH_NAME)),) publish.artifacts: $(foreach r,$(XPKG_REG_ORGS), $(foreach x,$(XPKGS),xpkg.release.publish.$(r).$(x))) endif From 79fc705ac034168146a809ca854041748e970e9d Mon Sep 17 00:00:00 2001 From: Carlos Vega Date: Wed, 6 Sep 2023 09:58:32 +0200 Subject: [PATCH 2/3] Add custom branch name to publish artifact Signed-off-by: Carlos Vega --- makelib/docs.mk | 4 ++-- makelib/image.mk | 6 +++--- makelib/imagelight.mk | 6 +++--- makelib/xpkg.mk | 6 +++--- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/makelib/docs.mk b/makelib/docs.mk index 3d46edb..9153f2f 100644 --- a/makelib/docs.mk +++ b/makelib/docs.mk @@ -68,7 +68,7 @@ docs.publish: docs.generate # ==================================================================================== # Common Targets -# only publish docs for master and release branches -ifneq ($(filter master release-%,$(BRANCH_NAME)),) +# only publish docs for main, master and release branches +ifneq ($(filter main master release-%,$(BRANCH_NAME)),) publish.artifacts: docs.publish endif diff --git a/makelib/image.mk b/makelib/image.mk index 1873647..7b0ffc4 100644 --- a/makelib/image.mk +++ b/makelib/image.mk @@ -246,9 +246,9 @@ clean: img.clean img.release.clean publish.init: img.release.build -# only publish images for main / master and release branches -# TODO(hasheddan): remove master and support overriding -ifneq ($(filter main master release-%,$(BRANCH_NAME)),) +# only publish images for main / master, release branches and custom branches in case of other naming convention +# TODO(hasheddan): remove master +ifneq ($(filter main master release-% $(PUBLISH_BRANCH_NAME),$(BRANCH_NAME)),) publish.artifacts: $(addprefix img.release.manifest.publish.,$(IMAGES)) endif diff --git a/makelib/imagelight.mk b/makelib/imagelight.mk index c4d3557..14ae4fe 100644 --- a/makelib/imagelight.mk +++ b/makelib/imagelight.mk @@ -124,9 +124,9 @@ endif build.done: img.done clean: img.clean img.release.clean -# only publish images for main / master and release branches -# TODO(hasheddan): remove master and support overriding -ifneq ($(filter main master release-%,$(BRANCH_NAME)),) +# only publish images for main / master, release branches and custom branches in case of other naming convention +# TODO(hasheddan): remove master +ifneq ($(filter main master release-% $(PUBLISH_BRANCH_NAME),$(BRANCH_NAME)),) publish.artifacts: $(foreach r,$(REGISTRY_ORGS), $(foreach i,$(IMAGES),img.release.publish.$(r).$(i))) endif diff --git a/makelib/xpkg.mk b/makelib/xpkg.mk index e7a5111..76cfa57 100644 --- a/makelib/xpkg.mk +++ b/makelib/xpkg.mk @@ -116,9 +116,9 @@ else build.artifacts.platform: do.skip.xpkgs endif -# only publish package for main / master and release branches -# TODO(hasheddan): remove master and support overriding -ifneq ($(filter main master release-% $(CUSTOM_BRANCH_NAME),$(BRANCH_NAME)),) +# only publish images for main / master, release branches and custom branches in case of other naming convention +# TODO(hasheddan): remove master +ifneq ($(filter main master release-% $(PUBLISH_BRANCH_NAME),$(BRANCH_NAME)),) publish.artifacts: $(foreach r,$(XPKG_REG_ORGS), $(foreach x,$(XPKGS),xpkg.release.publish.$(r).$(x))) endif From d403c9190d876cf76359e2554ab9999f4e52f8eb Mon Sep 17 00:00:00 2001 From: Carlos Vega Date: Wed, 6 Sep 2023 09:59:38 +0200 Subject: [PATCH 3/3] Add custom branch name to publish artifact Signed-off-by: Carlos Vega --- makelib/xpkg.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/makelib/xpkg.mk b/makelib/xpkg.mk index 76cfa57..caf7065 100644 --- a/makelib/xpkg.mk +++ b/makelib/xpkg.mk @@ -116,7 +116,7 @@ else build.artifacts.platform: do.skip.xpkgs endif -# only publish images for main / master, release branches and custom branches in case of other naming convention +# only publish package for main / master, release branches and custom branches in case of other naming convention # TODO(hasheddan): remove master ifneq ($(filter main master release-% $(PUBLISH_BRANCH_NAME),$(BRANCH_NAME)),) publish.artifacts: $(foreach r,$(XPKG_REG_ORGS), $(foreach x,$(XPKGS),xpkg.release.publish.$(r).$(x)))