Skip to content

Fix Make targets with registry orgs containing slashes #49

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rossigee wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Fix Make targets with registry orgs containing slashes #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
daf2a7c
Update makelib/xpkg.mk
rossigee Oct 30, 2025
d4afb65
Fix Make targets with registry orgs containing slashes
rossigee Oct 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 9 additions & 8 deletions makelib/imagelight.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,20 +90,21 @@ img.done:

# 1: registry 2: image
define repo.targets
img.release.publish.$(1).$(2):
REGISTRY_SANITIZED := $(subst /,-,$(1))
img.release.publish.$(REGISTRY_SANITIZED).$(2):
@$(MAKE) -C $(IMAGE_DIR)/$(2) IMAGE_PLATFORMS=$(IMAGE_PLATFORMS) IMAGE=$(1)/$(2):$(VERSION) img.publish
img.release.publish: img.release.publish.$(1).$(2)
img.release.publish: img.release.publish.$(REGISTRY_SANITIZED).$(2)

img.release.promote.$(1).$(2):
img.release.promote.$(REGISTRY_SANITIZED).$(2):
@$(MAKE) -C $(IMAGE_DIR)/$(2) TO_IMAGE=$(1)/$(2):$(CHANNEL) FROM_IMAGE=$(1)/$(2):$(VERSION) img.promote
@[ "$(CHANNEL)" = "master" ] || $(MAKE) -C $(IMAGE_DIR)/$(2) TO_IMAGE=$(1)/$(2):$(VERSION)-$(CHANNEL) FROM_IMAGE=$(1)/$(2):$(VERSION) img.promote
img.release.promote: img.release.promote.$(1).$(2)
img.release.promote: img.release.promote.$(REGISTRY_SANITIZED).$(2)

img.release.clean.$(1).$(2):
img.release.clean.$(REGISTRY_SANITIZED).$(2):
@[ -z "$$$$(docker images -q $(1)/$(2):$(VERSION))" ] || docker rmi $(1)/$(2):$(VERSION)
@[ -z "$$$$(docker images -q $(1)/$(2):$(VERSION)-$(CHANNEL))" ] || docker rmi $(1)/$(2):$(VERSION)-$(CHANNEL)
@[ -z "$$$$(docker images -q $(1)/$(2):$(CHANNEL))" ] || docker rmi $(1)/$(2):$(CHANNEL)
img.release.clean: img.release.clean.$(1).$(2)
img.release.clean: img.release.clean.$(REGISTRY_SANITIZED).$(2)
endef
$(foreach r,$(REGISTRY_ORGS), $(foreach i,$(IMAGES),$(eval $(call repo.targets,$(r),$(i)))))

Expand All @@ -127,7 +128,7 @@ clean: img.clean img.release.clean
# only publish images for main / master and release branches by default
RELEASE_BRANCH_FILTER ?= main master release-%
ifneq ($(filter $(RELEASE_BRANCH_FILTER),$(BRANCH_NAME)),)
publish.artifacts: $(foreach r,$(REGISTRY_ORGS), $(foreach i,$(IMAGES),img.release.publish.$(r).$(i)))
publish.artifacts: $(foreach r,$(REGISTRY_ORGS), $(foreach i,$(IMAGES),img.release.publish.$(subst /,-,$(r)).$(i)))
endif

promote.artifacts: $(foreach r,$(REGISTRY_ORGS), $(foreach i,$(IMAGES),img.release.promote.$(r).$(i)))
promote.artifacts: $(foreach r,$(REGISTRY_ORGS), $(foreach i,$(IMAGES),img.release.promote.$(subst /,-,$(r)).$(i)))
4 changes: 2 additions & 2 deletions makelib/xpkg.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ endif

# 1: xpkg
define xpkg.build.targets
xpkg.build.$(1):
xpkg.build.$(1): $(CROSSPLANE_CLI)
ifeq ($(XPKG_CLEANUP_EXAMPLES_ENABLED),true)
@rm -rf $(WORK_DIR)/xpkg-cleaned-examples
@GOOS=$(HOSTOS) GOARCH=$(TARGETARCH) go run github.com/upbound/uptest/cmd/cleanupexamples@$(XPKG_CLEANUP_EXAMPLES_VERSION) $(XPKG_EXAMPLES_DIR) $(XPKG_PROCESSED_EXAMPLES_DIR) || $(FAIL)
Expand All @@ -90,7 +90,7 @@ $(foreach x,$(XPKGS),$(eval $(call xpkg.build.targets,$(x))))

# 1: registry/org 2: repo
define xpkg.release.targets
xpkg.release.publish.$(1).$(2):
xpkg.release.publish.$(1).$(2): $(CROSSPLANE_CLI)
@$(INFO) Pushing package $(1)/$(2):$(VERSION)
@$(CROSSPLANE_CLI) xpkg push \
$(foreach p,$(XPKG_LINUX_PLATFORMS),--package-files $(XPKG_OUTPUT_DIR)/$(p)/$(2)-$(VERSION).xpkg ) \
Expand Down