Skip to content

Commit

Permalink
Merge branch 'release/q1-2024' of github.com:wireapp/wire-account int…
Browse files Browse the repository at this point in the history
…o release/q1-2024
  • Loading branch information
tlebon committed Jan 25, 2024
2 parents 03759d2 + ea33f4f commit f11cc5c
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 1 deletion.
23 changes: 23 additions & 0 deletions .github/workflows/cherry-pick-release-to-dev.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# This job will automatically create a cherry pick PR from any release/* branch to the staging branch
# It allows the staging branch to stay up-to-date with fixes made to specific release branches
name: Cherry pick to staging
on:
push:
branches:
- release/*
jobs:
cherry_pick:
runs-on: ubuntu-latest
steps:
- name: checkout
uses: actions/checkout@v4
with:
fetch-depth: 0

- name: Create PR to branch
uses: gorillio/github-action-cherry-pick@master
with:
pr_branch: 'staging'
env:
GITHUB_TOKEN: ${{ secrets.OTTO_THE_BOT_GH_TOKEN }}

2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ on:
tags:
- v*
pull_request:
branches: [staging, main]
branches: [staging, main, release/*]

jobs:
test_build_deploy:
Expand Down

0 comments on commit f11cc5c

Please sign in to comment.