From be3eed10205b0e60aa20035b0b45229681f3a314 Mon Sep 17 00:00:00 2001 From: Shalin Patel Date: Thu, 19 Sep 2024 12:01:44 -0700 Subject: [PATCH] ci(main): enable creating release-please PR from release branches (#912) **What problem does this PR solve?**: - enable creating release-please PR from release branch - set caren provider to use v0.15.x in CAREN e2e tests. --- docs/content/contributing/releasing.md | 5 ++++- make/dev.mk | 8 ++++---- test/e2e/config/caren.yaml | 4 ++-- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/docs/content/contributing/releasing.md b/docs/content/contributing/releasing.md index c1883a27c..b9266b514 100644 --- a/docs/content/contributing/releasing.md +++ b/docs/content/contributing/releasing.md @@ -10,7 +10,10 @@ This project uses [release-please] to automate changelog updates per release. Du [release-please-action]. When a release has been cut, a new release PR can be created manually using the `release-please` CLI locally. This needs -to be run by someone with write permissions to the repository. Create the `release-please` branch and PR: +to be run by someone with write permissions to the repository. +The new release PR can be only created against `main` or `release/*` branch. +Ensure to checkout `main` or `release/*` branch locally. +Create the `release-please` branch and PR from `main` or `release/*` branch: ```shell make release-please diff --git a/make/dev.mk b/make/dev.mk index c5bcd155d..9fd2d8421 100644 --- a/make/dev.mk +++ b/make/dev.mk @@ -45,11 +45,11 @@ dev.update-bootstrap-credentials-aws: .PHONY: release-please release-please: -ifneq ($(GIT_CURRENT_BRANCH),main) - $(error "release-please should only be run on the main branch") +# filter Returns all whitespace-separated words in text that do match any of the pattern words. +ifeq ($(filter main release/v%,$(GIT_CURRENT_BRANCH)),) + $(error "release-please should only be run on the main or release branch") else - release-please release-pr \ - --repo-url $(GITHUB_ORG)/$(GITHUB_REPOSITORY) --token "$$(gh auth token)" + release-please release-pr --repo-url $(GITHUB_ORG)/$(GITHUB_REPOSITORY) --target-branch $(GIT_CURRENT_BRANCH) --token "$$(gh auth token)" endif .PHONY: .envrc.e2e diff --git a/test/e2e/config/caren.yaml b/test/e2e/config/caren.yaml index 12d22d1a5..802071a27 100644 --- a/test/e2e/config/caren.yaml +++ b/test/e2e/config/caren.yaml @@ -134,8 +134,8 @@ providers: - name: caren type: RuntimeExtensionProvider versions: - - name: "{go://github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix@v0.14}" - value: "https://github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/releases/download/{go://github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix@v0.14}/runtime-extension-components.yaml" + - name: "{go://github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix@v0.15}" + value: "https://github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix/releases/download/{go://github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix@v0.15}/runtime-extension-components.yaml" type: "url" contract: v1beta1 files: