Skip to content

Added test workflow for automatic merge (using test branches 'main_te… #1

Added test workflow for automatic merge (using test branches 'main_te…

Added test workflow for automatic merge (using test branches 'main_te… #1

Workflow file for this run

name: Automatic merge
on:
push:
schedule:
# Run every Sunday at 03:07 (AEDT)
# AEDT is UTC+10 --> Sunday at 03:07 AEDT is Saturday at 17:07 UTC
- cron: "7 17 * * SAT"
workflow_dispatch:
jobs:
auto-merge:
runs-on: ubuntu-latest
permissions: write-all
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 --global user.name "GitHub Actions"
git config --global user.email "[email protected]"
git checkout main_test # TODO: Delete
git merge --no-ff -X theirs origin/development_test -m "Automatically merge 'development' to 'main'. # TODO: Delete
# 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
git push origin main_test # TODO: Delete