Merge pull request #149 from ThatsMrTalbot/fix/olm-git-publish

fix: pushing olm bundles to github was failing due to missing credentials
cert-manager · May 21, 2024 · 8fbdf9e · 8fbdf9e
2 parents fea0c62 + f2792cd
commit 8fbdf9e
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/modules/olm-bundle/01_mod.mk b/modules/olm-bundle/01_mod.mk
@@ -93,9 +93,9 @@ olm-publish-$(subst /,-,$1): olm-bundle | $(NEEDS_GH) $(bin_dir)/scratch
 		$(if $(and $(findstring redhat-openshift-ecosystem/certified-operators,$1),$(olm_project_id)), \
 			$(YQ) -i '.cert_project_id = "$(olm_project_id)"' operators/$(olm_project_name)/ci.yaml &&) \
 		git add operators/$(olm_project_name)/ci.yaml && \
-		git commit -m "operator $(olm_project_name) ($(patsubst v%,%,$(VERSION)))" && \
-		git push origin $(VERSION) && \
-		$(GH) pr create --repo $1 --head $(firstword $(subst /, ,$2)):$(VERSION) --title "operator $(olm_project_name) ($(patsubst v%,%,$(VERSION)))"
+		git commit -m "operator $(olm_project_name) ($(VERSION))" && \
+		git push -f -c "credential.helper=!$(GH) auth git-credential" origin $(VERSION) && \
+		{ $(GH) pr create --repo $1 --head $(firstword $(subst /, ,$2)):$(VERSION) --title "operator $(olm_project_name) ($(VERSION))" ||: }
 
 olm-publish: olm-publish-$(subst /,-,$1)
 endef