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.

Sign up for GitHub

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: rebase the latest release branch on push to main #24

Merged
merged 1 commit into from
Oct 9, 2024
Merged

chore: rebase the latest release branch on push to main #24

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
38 changes: 38 additions & 0 deletions .github/workflows/rebase_latest_version.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
name: Auto rebase the latest version branch with main
on:
push:
branches:
- main

jobs:
synchronise_version_branch:
name: Synchronize the latest branch
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@d632683dd7b4114ad314bca15554477dd762a938
with:
fetch-depth: 0

- name: Get branch for the latest version
run: |
echo "DATA_LATEST_VERSION=\
$(git for-each-ref --format='%(refname:short)' refs/remotes/origin \
| grep -Po '(?<=origin/)v\d.\d(.\d)?$' \
| sort -V | tail -n 1\
)" >> $GITHUB_ENV

- name: Rebase and push
run: |
git switch $DATA_LATEST_VERSION
git rebase main
git push --force-with-lease
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

if this fails we likely need a notification in our updates channel wdyt ?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can do that but I don't think this repo has acces to the slack bot token

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

see with @soonum then please

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The token has been enabled for this repo, so now it should work


- name: Slack Notification
if: ${{ always() && job.status == 'failure' }}
continue-on-error: true
uses: rtCamp/action-slack-notify@4e5fb42d249be6a45a298f3c9543b111b02f7907
env:
SLACK_COLOR: ${{ job.status }}
SLACK_MESSAGE: "backward-compat-data failed to rebase branch {{ env.DATA_LATEST_VERSION }} into main: (${{ env.ACTION_RUN_URL }})"