Skip to content

Commit 800c854

Browse files
Enhance the makefile target check to skip CRDs that are new
1 parent c4ee548 commit 800c854

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

catalogd/Makefile

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,10 +131,15 @@ verify: tidy fmt vet generate ## Verify the current code generation and lint
131131

132132
.PHONY: verify-crd-compatibility
133133
CRD_DIFF_ORIGINAL_REF := main
134-
CRD_DIFF_UPDATED_SOURCE := file://config/base/crd/bases/olm.operatorframework.io_clustercatalogs.yaml
135134
CRD_DIFF_CONFIG := crd-diff-config.yaml
136135
verify-crd-compatibility: $(CRD_DIFF)
137-
$(CRD_DIFF) --config="${CRD_DIFF_CONFIG}" "git://${CRD_DIFF_ORIGINAL_REF}?path=config/base/crd/bases/olm.operatorframework.io_clustercatalogs.yaml" ${CRD_DIFF_UPDATED_SOURCE}
136+
@if git show ${CRD_DIFF_ORIGINAL_REF}:${CRD_PATH} > /dev/null 2>&1; then \
137+
echo "Running CRD diff for ${CRD_PATH}..."; \
138+
$(CRD_DIFF) --config="${CRD_DIFF_CONFIG}" "git://${CRD_DIFF_ORIGINAL_REF}?path=${CRD_PATH}" "file://${CRD_PATH}"; \
139+
else \
140+
echo "Skipping CRD diff check for ${CRD_PATH} as it is new."; \
141+
fi
142+
138143

139144
.PHONY: lint
140145
lint: $(GOLANGCI_LINT) ## Run golangci linter.

0 commit comments

Comments
 (0)