diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index aa0c59c..336341e 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -22,7 +22,7 @@ on: jobs: build: name: Release operator - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest steps: - name: Install gettext-base run: | @@ -43,9 +43,9 @@ jobs: git checkout -b release-v${{ inputs.limitadorOperatorVersion }} - name: Prepare release run: | + make prepare-release \ VERSION=${{ inputs.limitadorOperatorVersion }} \ - LIMITADOR_VERSION=${{ inputs.limitadorVersion }} \ - make prepare-release + LIMITADOR_VERSION=${{ inputs.limitadorVersion }} - name: Commit and push run: | git config --global user.name "github-actions[bot]" diff --git a/Makefile b/Makefile index 39bceb5..e25a335 100644 --- a/Makefile +++ b/Makefile @@ -380,7 +380,7 @@ print-bundle-image: ## Pring bundle images. .PHONY: prepare-release prepare-release: IMG_TAG=v$(VERSION) prepare-release: ## Prepare the manifests for OLM and Helm Chart for a release. - echo -e "#Release default values\\nIMG=$(IMAGE_TAG_BASE):$(IMG_TAG)\nBUNDLE_IMG=$(IMAGE_TAG_BASE)-bundle:$(IMG_TAG)\n\ + echo -e "#Release default values\\nLIMITADOR_VERSION=$(nLIMITADOR_VERSION)\nIMG=$(IMAGE_TAG_BASE):$(IMG_TAG)\nBUNDLE_IMG=$(IMAGE_TAG_BASE)-bundle:$(IMG_TAG)\n\ CATALOG_IMG=$(IMAGE_TAG_BASE)-catalog:$(IMG_TAG)\nCHANNELS=$(CHANNELS)\nBUNDLE_CHANNELS=--channels=$(CHANNELS)\n\ VERSION=$(VERSION)" > $(RELEASE_FILE) $(MAKE) bundle VERSION=$(VERSION) \