Skip to content

Commit fb74fb3

Browse files
authored
Merge pull request #868 from ulucinar/easy-subpackages
Use a wildcard for Make variable SUBPACKAGES to represent all family packages
2 parents ad30679 + cb25658 commit fb74fb3

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

Makefile

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,10 @@ BUILDTAGGER_VERSION ?= v0.12.0-rc.0.28.gdc5d6f3
6262
BUILDTAGGER_DOWNLOAD_URL ?= https://s3.us-west-2.amazonaws.com/upbound.official-providers-ci.releases/main/$(BUILDTAGGER_VERSION)/bin/$(SAFEHOST_PLATFORM)/buildtagger
6363
endif
6464

65-
# SUBPACKAGES ?= $(shell find cmd/provider -type d -maxdepth 1 -mindepth 1 | cut -d/ -f3)
6665
SUBPACKAGES ?= monolith
66+
ifeq ($(strip $(SUBPACKAGES)),*)
67+
override SUBPACKAGES := $(filter-out monolith,$(shell find cmd/provider -type d -maxdepth 1 -mindepth 1 | cut -d/ -f3))
68+
endif
6769
GO_STATIC_PACKAGES ?= $(GO_PROJECT)/cmd/generator ${SUBPACKAGES:%=$(GO_PROJECT)/cmd/provider/%}
6870
GO_LDFLAGS += -X $(GO_PROJECT)/internal/version.Version=$(VERSION)
6971
GO_SUBDIRS += cmd internal apis generate
@@ -377,7 +379,10 @@ go.lint.analysiskey-interval:
377379
go.lint.analysiskey:
378380
@echo $$(make go.lint.analysiskey-interval)$$(sha1sum go.sum | cut -d' ' -f1)
379381

380-
.PHONY: cobertura reviewable submodules fallthrough go.mod.cachedir go.lint.analysiskey-interval go.lint.analysiskey go.cachedir run crds.clean $(TERRAFORM_PROVIDER_SCHEMA) load-pkg
382+
print-subpackages:
383+
@echo $(SUBPACKAGES)
384+
385+
.PHONY: cobertura reviewable submodules fallthrough go.mod.cachedir go.lint.analysiskey-interval go.lint.analysiskey go.cachedir run crds.clean $(TERRAFORM_PROVIDER_SCHEMA) load-pkg print-subpackages
381386

382387
build.init: kustomize-crds
383388

0 commit comments

Comments
 (0)