Skip to content

Commit

Permalink
Add github action to merge release/* branch back into main (microsoft…
Browse files Browse the repository at this point in the history
  • Loading branch information
timotheeguerin authored Oct 19, 2022
1 parent 5c837b5 commit 08502ef
Showing 1 changed file with 44 additions and 0 deletions.
44 changes: 44 additions & 0 deletions .github/workflows/merge-release-in-main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
name: Merge release branch back into main

on:
# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:
push:
branches:
- "release/*"

concurrency: ${{ github.workflow }}-${{ github.ref }}

# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
permissions:
id-token: write
contents: write
pull-requests: write

jobs:
# Create PR
create:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3

- name: Generate branch name
id: branchname
run: |
echo "::set-output name=branchname::backmerge/${{ github.ref_name }}-$(date +'%Y-%m-%d')"
- name: Create branch
run: |
branch="${{ steps.branchname.outputs.branchname }}"
git checkout -b $branch
git push --set-upstream origin $branch
- name: create pull request
id: open-pr
uses: repo-sync/pull-request@v2
with:
github_token: ${{ secrets.GITHUB_TOKEN }}
source_branch: ${{ steps.branchname.outputs.branchname }}
destination_branch: ${{ github.event.repository.default_branch }}
pr_title: "[Automated] Merge ${{ github.ref_name }} into ${{ github.event.repository.default_branch }}"
pr_body: "Merge ${{github.ref}} back into ${{ github.event.repository.default_branch }}"

0 comments on commit 08502ef

Please sign in to comment.