Merge pull request #156 from razo7/fix-release-job

Small Fixes to Release Job, Push Pipeline and catalog-build

Author: openshift-merge-bot[bot]

.github/workflows/post-submit.yaml

@@ -3,8 +3,6 @@ on:
   push:
     branches:
       - main
-    tags:
-      - 'v*'
 
 permissions:
   contents: write

Makefile

@@ -457,8 +457,8 @@ build-tools: ## Download & build all the tools locally if necessary.
 # https://github.com/operator-framework/community-operators/blob/7f1438c/docs/packaging-operator.md#updating-your-existing-operator
 .PHONY: catalog-build
 catalog-build: opm ## Build a file-based catalog image.
-	# Remove the catalog directory and Dockerfile
-	-rm -r ${CATALOG_DIR} ${CATALOG_DOCKERFILE}
+	# Remove the catalog directory and Dockerfile if they exist
+	-rm -rf ${CATALOG_DIR} ${CATALOG_DOCKERFILE}
 	@mkdir -p ${CATALOG_DIR}
 	$(OPM) generate dockerfile ${CATALOG_DIR}
 	$(OPM) init ${OPERATOR_NAME} \
@@ -472,7 +472,7 @@ catalog-build: opm ## Build a file-based catalog image.
 	$(OPM) validate ${CATALOG_DIR}
 	docker build . -f ${CATALOG_DOCKERFILE} -t ${CATALOG_IMG}
 	# Clean up the catalog directory and Dockerfile
-	rm -r ${CATALOG_DIR} ${CATALOG_DOCKERFILE}
+	-rm -rf ${CATALOG_DIR} ${CATALOG_DOCKERFILE}
 
 .PHONY: catalog-push
 catalog-push: ## Push a catalog image.
@@ -498,7 +498,7 @@ container-build: check ## Build containers
 	make docker-build bundle-build
 
 .PHONY: bundle-build-community
-bundle-build-community: bundle-community ## Run bundle community changes in CSV, and then build the bundle image.
+bundle-build-community: bundle-community-k8s ## Run bundle community changes in CSV, and then build the bundle image.
 	docker build -f bundle.Dockerfile -t $(BUNDLE_IMG) .
 
 .PHONY: container-build-community