Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: update release pipeline #4470

Merged
merged 3 commits into from
Jan 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
6 changes: 5 additions & 1 deletion .github/workflows/test_build_deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: Test, Build & Deploy

on:
push:
branches: [staging, main]
branches: [staging, main, release/*]
tags:
- v*

Expand Down 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
Loading