Skip to content

Commit

Permalink
ci(main): enable creating release-please PR from release branches (#912)
Browse files Browse the repository at this point in the history
**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.
  • Loading branch information
supershal committed Sep 19, 2024
1 parent 4bc803b commit be3eed1
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 7 deletions.
5 changes: 4 additions & 1 deletion docs/content/contributing/releasing.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions make/dev.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions test/e2e/config/caren.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit be3eed1

Please sign in to comment.