Skip to content

Commit c252597

Browse files
authored
Merge pull request #1495 from turkenf/add-cleanupexamples
Add cleanupexamples tool to subpackages build process
2 parents 4a84e6b + da19451 commit c252597

1 file changed

Lines changed: 5 additions & 1 deletion

File tree

cluster/images/provider-aws/Makefile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,10 @@ ifeq (-,$(findstring -,$(VERSION)))
5656
endif
5757
BUILD_ONLY ?= false
5858
STORE_PACKAGES ?= ""
59+
XPKG_CLEANUP_EXAMPLES_VERSION ?= v0.12.1
5960
batch-process: $(UP)
61+
@rm -rf $(WORK_DIR)/xpkg-cleaned-examples
62+
@GOOS=$(HOSTOS) GOARCH=$(TARGETARCH) go run github.com/upbound/uptest/cmd/cleanupexamples@$(XPKG_CLEANUP_EXAMPLES_VERSION) $(ROOT_DIR)/examples $(WORK_DIR)/xpkg-cleaned-examples || $(FAIL)
6063
@$(INFO) Batch processing smaller provider packages for: "$(SUBPACKAGES)"
6164
@mkdir -p "$(XPKG_OUTPUT_DIR)/$(PLATFORM)" && \
6265
$(UP) xpkg batch --smaller-providers "$$(tr ' ' ',' <<< "$(SUBPACKAGES)")" \
@@ -69,7 +72,7 @@ batch-process: $(UP)
6972
--output-dir $(XPKG_OUTPUT_DIR) \
7073
--store-packages "$(STORE_PACKAGES)" \
7174
--build-only=$(BUILD_ONLY) \
72-
--examples-root $(ROOT_DIR)/examples \
75+
--examples-root $(WORK_DIR)/xpkg-cleaned-examples \
7376
--examples-group-override monolith=* --examples-group-override config=providerconfig \
7477
--auth-ext $(XPKG_DIR)/auth.yaml \
7578
--crd-root $(XPKG_DIR)/crds \
@@ -80,3 +83,4 @@ batch-process: $(UP)
8083
--concurrency $(CONCURRENCY) \
8184
--push-retry 10 || $(FAIL)
8285
@$(OK) Done processing smaller provider packages for: "$(SUBPACKAGES)"
86+
@rm -rf $(WORK_DIR)/xpkg-cleaned-examples

0 commit comments

Comments
 (0)