From 6b0bd3b9e19ac8f8d28d621f8151b177c4321537 Mon Sep 17 00:00:00 2001 From: Daniel Grimm Date: Tue, 23 Apr 2024 14:33:25 +0200 Subject: [PATCH] Make bundle generation work during merges This is required for https://github.com/openshift-service-mesh/sail-operator/pull/14 Signed-off-by: Daniel Grimm --- Makefile.core.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.core.mk b/Makefile.core.mk index 94acbf9fa..ac306ef03 100644 --- a/Makefile.core.mk +++ b/Makefile.core.mk @@ -461,7 +461,7 @@ bundle: gen helm operator-sdk ## Generate bundle manifests and metadata, then va if (git ls-files --error-unmatch "$$csvPath" &>/dev/null); then \ if ! (git diff "$$csvPath" | grep '^[+-][^+-][^+-]' | grep -v "createdAt:" >/dev/null); then \ echo "reverting timestamp change in $$csvPath"; \ - git checkout "$$csvPath"; \ + git checkout "$$csvPath" || echo "failed to revert timestamp change. assuming we're in the middle of a merge"; \ fi \ fi $(OPERATOR_SDK) bundle validate ./bundle