-
Notifications
You must be signed in to change notification settings - Fork 26
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'refs/heads/feat/WPB-8592' into feat/pass-signature-algo…
…rithm-when-registring-mls-client # Conflicts: # .github/workflows/cherry-pick-rc-to-develop.yml
- Loading branch information
Showing
2 changed files
with
48 additions
and
156 deletions.
There are no files selected for viewing
48 changes: 48 additions & 0 deletions
48
.github/workflows/cherry-pick-pr-to-newer-release-cycle.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,48 @@ | ||
# GitHub Action: Cherry-pick merged PRs to `TARGET_BRANCH` | ||
# | ||
# This action automates the process of cherry-picking merged PRs from `release/candidate` branch to `TARGET_BRANCH`. | ||
# It is triggered whenever a pull request is merged into `release/candidate`. | ||
# | ||
# The action performs the following steps: | ||
# 1. Checkout the merged PR. | ||
# 2. If changes are made outside the specified submodule or no submodule is specified, the action proceeds. | ||
# 3. If a submodule name is provided in the `SUBMODULE_NAME` environment variable: | ||
# a. The action creates a temporary branch. | ||
# b. Updates the submodule to its latest version from the target branch. | ||
# c. Commits the submodule updates. | ||
# 4. Squashes the commit with the commit message of the merged PR (if a submodule was updated). | ||
# 5. Cherry-picks the squashed (or original if no squashing occurred) commit to a new branch based on target. | ||
# 6. If any conflicts arise during the cherry-pick, they are committed. | ||
# 7. The branch with the cherry-picked changes is pushed. | ||
# 8. A new pull request is created against `develop` with the cherry-picked changes. | ||
|
||
name: "Cherry-pick from 4.6 to RC" | ||
|
||
on: | ||
pull_request: | ||
branches: | ||
- release/cycle-4.6 | ||
types: | ||
- closed | ||
|
||
jobs: | ||
cherry-pick: | ||
runs-on: ubuntu-latest | ||
if: github.event.pull_request.merged == true | ||
|
||
env: | ||
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} | ||
|
||
steps: | ||
- name: Checkout | ||
uses: actions/checkout@v4 | ||
with: | ||
fetch-depth: 0 | ||
|
||
- name: Cherry pick to `RC` | ||
uses: wireapp/[email protected] | ||
with: | ||
target-branch: release/candidate | ||
submodule-name: kalium | ||
pr-title-suffix: 🍒 | ||
labels: cherry-pick |
This file was deleted.
Oops, something went wrong.