diff --git a/.github/workflows/crd-diff.yaml b/.github/workflows/crd-diff.yaml index 94cbf5a85..49a1b32da 100644 --- a/.github/workflows/crd-diff.yaml +++ b/.github/workflows/crd-diff.yaml @@ -14,5 +14,5 @@ jobs: go-version-file: go.mod - name: Run make verify-crd-compatibility - run: make verify-crd-compatibility CRD_DIFF_ORIGINAL_REF=${{ github.event.pull_request.base.sha }} CRD_DIFF_UPDATED_REF=${{ github.event.pull_request.head.sha }} + run: make verify-crd-compatibility CRD_DIFF_ORIGINAL_REF=${{ github.event.pull_request.base.sha }} CRD_DIFF_UPDATED_SOURCE="git://${{ github.event.pull_request.head.sha }}?path=config/base/crd/bases/olm.operatorframework.io_clusterextensions.yaml" diff --git a/Makefile b/Makefile index 8818c9391..b91ce1ffc 100644 --- a/Makefile +++ b/Makefile @@ -132,10 +132,10 @@ bingo-upgrade: $(BINGO) #EXHELP Upgrade tools .PHONY: verify-crd-compatibility CRD_DIFF_ORIGINAL_REF := main -CRD_DIFF_UPDATED_REF := HEAD +CRD_DIFF_UPDATED_SOURCE := file://config/base/crd/bases/olm.operatorframework.io_clusterextensions.yaml CRD_DIFF_CONFIG := crd-diff-config.yaml -verify-crd-compatibility: $(CRD_DIFF) - $(CRD_DIFF) --config="${CRD_DIFF_CONFIG}" "git://${CRD_DIFF_ORIGINAL_REF}?path=config/base/crd/bases/olm.operatorframework.io_clusterextensions.yaml" "git://${CRD_DIFF_UPDATED_REF}?path=config/base/crd/bases/olm.operatorframework.io_clusterextensions.yaml" +verify-crd-compatibility: $(CRD_DIFF) manifests + $(CRD_DIFF) --config="${CRD_DIFF_CONFIG}" "git://${CRD_DIFF_ORIGINAL_REF}?path=config/base/crd/bases/olm.operatorframework.io_clusterextensions.yaml" ${CRD_DIFF_UPDATED_SOURCE} .PHONY: test test: manifests generate fmt vet test-unit test-e2e #HELP Run all tests.