Skip to content

Commit

Permalink
Merge pull request #2707 from chaoss/add-auto-merge-gh-action
Browse files Browse the repository at this point in the history
Add GitHub Action to Always Keep Dev up to Date with Main
  • Loading branch information
sgoggins authored Feb 20, 2024
2 parents 017a6e9 + 2bf0fb9 commit c6e9770
Showing 1 changed file with 22 additions and 0 deletions.
22 changes: 22 additions & 0 deletions .github/workflows/auto_merge.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
name: Merge main into dev

on:
push:
branches:
- main

jobs:
update-dev:
permissions: write-all
name: update-dev
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- run: |
git checkout dev
git merge main
- name: Push to dev
uses: CasperWA/push-protected@v2
with:
token: ${{ secrets.GITHUB_TOKEN }}
branch: dev

0 comments on commit c6e9770

Please sign in to comment.