Skip to content

Commit ecd86c1

Browse files
Merge pull request #125 from openshift-cherrypick-robot/cherry-pick-124-to-release-0.17
[release-0.17] Skip previous version validation in CI
2 parents 9b53a7d + 5f1d568 commit ecd86c1

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

Makefile

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ export DEFAULT_CHANNEL
4646
# To re-generate a bundle for another specific version without changing the standard setup, you can:
4747
# - use the VERSION as arg of the bundle target (e.g make bundle VERSION=0.0.2)
4848
# - use environment variables to overwrite this value (e.g export VERSION=0.0.2)
49+
CI_VERSION := 9.9.9-dummy
4950
VERSION ?= $(DEFAULT_VERSION)
5051
PREVIOUS_VERSION ?= $(DEFAULT_VERSION)
5152
export VERSION
@@ -213,10 +214,10 @@ bundle-update: verify-previous-version ## Update CSV fields and validate the bun
213214

214215
.PHONY: verify-previous-version
215216
verify-previous-version: ## Verifies that PREVIOUS_VERSION variable is set
216-
@if [ $(VERSION) != $(DEFAULT_VERSION) ] && [ $(PREVIOUS_VERSION) = $(DEFAULT_VERSION) ]; then \
217-
echo "Error: PREVIOUS_VERSION must be set for the selected VERSION"; \
218-
exit 1; \
219-
fi
217+
@if [ $(VERSION) != $(DEFAULT_VERSION) ] && [ $(VERSION) != $(CI_VERSION) ] && [ $(PREVIOUS_VERSION) = $(DEFAULT_VERSION) ]; then \
218+
echo "Error: PREVIOUS_VERSION must be set for the selected VERSION"; \
219+
exit 1; \
220+
fi
220221

221222
.PHONY: bundle-reset-date
222223
bundle-reset-date: ## Reset bundle's createdAt

0 commit comments

Comments
 (0)