From 144e8d98c50124797d05bba34987d19d3c60259f Mon Sep 17 00:00:00 2001 From: Per Goncalves da Silva Date: Fri, 4 Apr 2025 14:29:42 +0200 Subject: [PATCH] remove convert-diff gha and tidy up Makefile Signed-off-by: Per Goncalves da Silva --- .github/workflows/convert-diff.yaml | 17 ----------------- Makefile | 9 +++++---- 2 files changed, 5 insertions(+), 21 deletions(-) delete mode 100644 .github/workflows/convert-diff.yaml diff --git a/.github/workflows/convert-diff.yaml b/.github/workflows/convert-diff.yaml deleted file mode 100644 index 7f7fde9e2..000000000 --- a/.github/workflows/convert-diff.yaml +++ /dev/null @@ -1,17 +0,0 @@ -name: bundle-convert-diff -on: - pull_request: -jobs: - bundle-convert-diff: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4 - with: - fetch-depth: 0 - - - uses: actions/setup-go@v5 - with: - go-version-file: go.mod - - - name: Run make verify-convert - run: make verify-convert diff --git a/Makefile b/Makefile index fd2983da1..0be7868f5 100644 --- a/Makefile +++ b/Makefile @@ -151,13 +151,14 @@ generate: $(CONTROLLER_GEN) #EXHELP Generate code containing DeepCopy, DeepCopyI $(CONTROLLER_GEN) --load-build-tags=$(GO_BUILD_TAGS) object:headerFile="hack/boilerplate.go.txt" paths="./..." .PHONY: verify -verify: tidy fmt generate manifests crd-ref-docs #HELP Verify all generated code is up-to-date. +verify: tidy fmt generate manifests crd-ref-docs generate-test-data #HELP Verify all generated code is up-to-date. git diff --exit-code -.PHONY: verify-convert -verify-convert: +# Renders registry+v1 bundles in test/convert +# Used by CI in verify to catch regressions in the registry+v1 -> plain conversion code +.PHONY: generate-test-data +generate-test-data: go run test/convert/generate-manifests.go - git diff --exit-code .PHONY: fix-lint fix-lint: $(GOLANGCI_LINT) #EXHELP Fix lint issues