Reinstated automatic-merge to use ADMIN_TOKEN #16
Workflow file for this run
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
name: Automatic merge | |
on: | |
schedule: | |
# Run every Monday at 03:09 (AEDT) | |
# AEDT is UTC+10 --> Monday at 03:09 AEDT is Sunday at 17:09 UTC | |
- cron: "9 17 * * SUN" | |
push: | |
jobs: | |
auto-merge: | |
runs-on: ubuntu-latest | |
steps: | |
- name: Checkout repo | |
uses: actions/checkout@master | |
with: | |
ref: main | |
fetch-depth: 0 | |
token: ${{ secrets.ADMIN_TOKEN }} | |
- name: Merge development to main | |
run: | | |
git config user.name "GitHub Actions" | |
git config user.email "[email protected]" | |
git config --list | |
git merge --no-ff -X theirs origin/development -m "Automatically merge 'development' to 'main'. | |
Merge commit issued by the automatic_merge workflow." | |
git push origin main |