Skip to content

add: Automatically backmerge to v2 on push to main #754

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

Merged
egil merged 2 commits into from
Jun 20, 2022
Merged

add: Automatically backmerge to v2 on push to main #754

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1089f7c
add: Automatically backmerge to v2 on push to main
linkdotnet Jun 16, 2022
7d9495e
Merge branch 'main' into feature/backmerge-to-v2
egil Jun 20, 2022
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
6 changes: 6 additions & 0 deletions .github/backmerge_failed.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
title: Back merge from main to v2 failed
labels: input needed
---

The back merge from main to v2 failed. Please investigate the GitHub Action and resolve the conflict manually.
44 changes: 44 additions & 0 deletions .github/workflows/backmerge-to-v2.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
name: Back merge to v2
on:
push:
branches:
- main
workflow_dispatch:

jobs:
backmerge:
timeout-minutes: 2
runs-on: ubuntu-latest
steps:
- name: 🛒 Checkout repository
uses: actions/checkout@v2

- name: ⚙️ Import GPG key
id: import_gpg
uses: crazy-max/ghaction-import-gpg@v3
with:
gpg-private-key: ${{ secrets.BUNIT_BOT_GPG_PRIVATE_KEY }}
passphrase: ${{ secrets.BUNIT_BOT_GPG_KEY_PASSPHRASE }}

- name: ⚙️ Setup CI GIT
run: |
git config user.name "${{ steps.import_gpg.outputs.name }}"
git config user.email ${{ steps.import_gpg.outputs.email }}
git config --global user.signingkey ${{ steps.import_gpg.outputs.keyid }}
git config --global commit.gpgsign true

- name: 🤹‍♀️ Merge main to v2
run: |
git fetch --unshallow
git checkout v2
git pull
git rebase origin/main && git push --force-with-lease

- name: Create issue if failed
if: failure()
uses: JasonEtco/create-an-issue@v2
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
filename: .github/backmerge-failed.md
update_existing: true