mirror of
https://github.com/Icinga/L10n.git
synced 2025-07-31 01:34:20 +02:00
automatic-resolve: Run if dispatched instead of by schedule
This commit is contained in:
parent
89a7b0517e
commit
5c3d9a3f1b
18
.github/workflows/automatic-resolve.yml
vendored
18
.github/workflows/automatic-resolve.yml
vendored
@ -1,23 +1,14 @@
|
|||||||
name: Automatic Resolve
|
name: Automatic Resolve
|
||||||
|
|
||||||
on:
|
on:
|
||||||
schedule:
|
repository_dispatch:
|
||||||
# Every day at UTC+8 midnight
|
types:
|
||||||
- cron: "5 8 * * *"
|
- resolve-command
|
||||||
# Every day at UTC+4 midnight
|
|
||||||
- cron: "5 4 * * *"
|
|
||||||
# Every day at UTC midnight
|
|
||||||
- cron: "5 0 * * *"
|
|
||||||
# Every day at UTC-4 midnight
|
|
||||||
- cron: "5 20 * * *"
|
|
||||||
# Every day at UTC-8 midnight
|
|
||||||
- cron: "5 16 * * *"
|
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
resolve-conflicts:
|
resolve-conflicts:
|
||||||
name: Automatic Conflict Resolution
|
name: Automatic Conflict Resolution
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
if: github.repository == 'Icinga/L10n'
|
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout code base
|
- name: Checkout code base
|
||||||
@ -35,7 +26,8 @@ jobs:
|
|||||||
git config user.name "icingabot"
|
git config user.name "icingabot"
|
||||||
git config user.email "65761963+icingabot@users.noreply.github.com"
|
git config user.email "65761963+icingabot@users.noreply.github.com"
|
||||||
|
|
||||||
- name: Resolve conflicting pull requests
|
- name: Resolve conflicting pull request
|
||||||
run: bin/autoresolve
|
run: bin/autoresolve
|
||||||
env:
|
env:
|
||||||
ICINGABOT_TOKEN: "${{ secrets.ICINGABOT_TOKEN }}"
|
ICINGABOT_TOKEN: "${{ secrets.ICINGABOT_TOKEN }}"
|
||||||
|
PULL_REQUEST_NO: "${{ github.event.client_payload.pull_request.number }}"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user