Skip to content

Commit

Permalink
Merge pull request #769 from ACCESS-NRI/access_bot_for_auto_merge
Browse files Browse the repository at this point in the history
Use access-bot for auto-merge
  • Loading branch information
atteggiani authored Sep 4, 2024
2 parents 4ac5e9f + 61935a8 commit 0ed1844
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 11 deletions.
27 changes: 19 additions & 8 deletions .github/workflows/automatic_merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,36 @@ name: Automatic merge

on:
schedule:
# Run every Sunday at 03:09 (AEDT)
# AEDT is UTC+10 --> Sunday at 03:09 AEDT is Saturday at 17:09 UTC
- cron: "9 17 * * SAT"
# 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"

jobs:
auto-merge:
runs-on: ubuntu-latest
permissions:
contents: write
steps:
- name: Checkout repo
uses: actions/checkout@master
uses: actions/checkout@v4
with:
ref: main
ref: main
fetch-depth: 0
token: ${{ secrets.ADMIN_TOKEN }}

- name: Import GPG settings
uses: crazy-max/ghaction-import-gpg@01dd5d3ca463c7f10f7f4f7b4f177225ac661ee4 # v6.1.0
with:
gpg_private_key: ${{ secrets.GH_ACTIONS_BOT_GPG_PRIVATE_KEY }}
passphrase: ${{ secrets.GH_ACTIONS_BOT_GPG_PASSPHRASE }}
git_config_global: true
git_committer_name: ${{ vars.GH_ACTIONS_BOT_GIT_USER_NAME }}
git_committer_email: ${{ vars.GH_ACTIONS_BOT_GIT_USER_EMAIL }}
git_user_signingkey: true
git_commit_gpgsign: true
git_tag_gpgsign: true

- name: Merge development to main
run: |
git config --global user.name "GitHub Actions"
git config --global user.email "[email protected]"
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
6 changes: 3 additions & 3 deletions .github/workflows/check_links.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@ on:
- reopened
- synchronize
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"
# Run every Monday at 03:07 (AEDT)
# AEDT is UTC+10 --> Monday at 03:07 AEDT is Sunday at 17:07 UTC
- cron: "7 17 * * SUN"
workflow_dispatch:

jobs:
Expand Down

0 comments on commit 0ed1844

Please sign in to comment.