Skip to content

Commit

Permalink
chore: update release pipeline
Browse files Browse the repository at this point in the history
  • Loading branch information
tlebon committed Jan 24, 2024
1 parent 3ac1c04 commit 5f2d1b9
Show file tree
Hide file tree
Showing 2 changed files with 33 additions and 0 deletions.
29 changes: 29 additions & 0 deletions .github/workflows/cherry-pick-release-to-dev.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
# 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 }}

# Add the auto-merge flag
- name: Enable auto-merge
run: gh pr edit ${{ github.event.pull_request.id }} --add-label auto-merge
env:
PR_URL: ${{github.event.pull_request.html_url}}
GITHUB_TOKEN: ${{secrets.WEBTEAM_AUTOMERGE_TOKEN}}
4 changes: 4 additions & 0 deletions .github/workflows/test_build_deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,10 @@ jobs:
wire_builds_target_branches='["dev"]'
fi
if [ "$version_tag" == "release/q1-2024" ]; then
wire_builds_target_branches='["q1-2024"]'
fi
echo "wire_builds_target_branches: $wire_builds_target_branches"
echo "wire_builds_target_branches=$wire_builds_target_branches" >> $GITHUB_OUTPUT
Expand Down

0 comments on commit 5f2d1b9

Please sign in to comment.