Skip to content

Commit a039691

Browse files
authored
ci(release/v0.14.x): enable creating release-please PR from release branches (#911)
**What problem does this PR solve?**: - enable creating first release-please PR for release branches - change CAREN e2e config to use version 0.14.x **How Has This Been Tested?**: <!-- Please describe the tests that you ran to verify your changes. Provide output from the tests and any manual steps needed to replicate the tests. --> on branches other than `main` and `release/*` ``` make release-please make/dev.mk:49: *** "release-please should only be run on the main or release branch". Stop. ``` on `release/v0.1.4.x` branch #910 **Special notes for your reviewer**: <!-- Use this to provide any additional information to the reviewers. This may include: - Best way to review the PR. - Where the author wants the most review attention on. - etc. -->
1 parent 9404bd0 commit a039691

File tree

3 files changed

+10
-7
lines changed

3 files changed

+10
-7
lines changed

docs/content/contributing/releasing.md

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,10 @@ This project uses [release-please] to automate changelog updates per release. Du
1010
[release-please-action].
1111

1212
When a release has been cut, a new release PR can be created manually using the `release-please` CLI locally. This needs
13-
to be run by someone with write permissions to the repository. Create the `release-please` branch and PR:
13+
to be run by someone with write permissions to the repository.
14+
The new release PR can be only created against `main` or `release/*` branch.
15+
Ensure to checkout `main` or `release/*` branch locally.
16+
Create the `release-please` branch and PR from `main` or `release/*` branch:
1417

1518
```shell
1619
make release-please

make/dev.mk

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,11 @@ dev.update-bootstrap-credentials-aws:
4545

4646
.PHONY: release-please
4747
release-please:
48-
ifneq ($(GIT_CURRENT_BRANCH),main)
49-
$(error "release-please should only be run on the main branch")
48+
# filter Returns all whitespace-separated words in text that do match any of the pattern words.
49+
ifeq ($(filter main release/v%,$(GIT_CURRENT_BRANCH)),)
50+
$(error "release-please should only be run on the main or release branch")
5051
else
51-
release-please release-pr \
52-
--repo-url $(GITHUB_ORG)/$(GITHUB_REPOSITORY) --token "$$(gh auth token)"
52+
release-please release-pr --repo-url $(GITHUB_ORG)/$(GITHUB_REPOSITORY) --target-branch $(GIT_CURRENT_BRANCH) --token "$$(gh auth token)"
5353
endif
5454

5555
.PHONY: .envrc.e2e

test/e2e/config/caren.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,8 @@ providers:
134134
- name: caren
135135
type: RuntimeExtensionProvider
136136
versions:
137-
- name: "{go://github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix@v0.13}"
138-
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.13}/runtime-extension-components.yaml"
137+
- name: "{go://github.com/nutanix-cloud-native/cluster-api-runtime-extensions-nutanix@v0.14}"
138+
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"
139139
type: "url"
140140
contract: v1beta1
141141
files:

0 commit comments

Comments
 (0)