Skip to content

Commit

Permalink
Added print of config options to automatic_merge.yml workflow.
Browse files Browse the repository at this point in the history
  • Loading branch information
atteggiani committed Sep 9, 2024
1 parent c2f50e4 commit 88054da
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions .github/workflows/automatic_merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ on:
# 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:
Expand Down Expand Up @@ -32,6 +33,7 @@ jobs:

- name: Merge development to main
run: |
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

0 comments on commit 88054da

Please sign in to comment.