aboutsummaryrefslogtreecommitdiff
path: root/.github/workflows
diff options
context:
space:
mode:
authorGeckoEidechse <40122905+GeckoEidechse@users.noreply.github.com>2024-08-25 19:18:42 +0200
committerGitHub <noreply@github.com>2024-08-25 19:18:42 +0200
commit5472a3630762db2d6880a4dafda9402dbbc872f8 (patch)
treea8602200e2f5052c6a7ccc9e75e03a428d2c7936 /.github/workflows
parentfff09b8b6805f66c87da2ac39ef5509bffb129cf (diff)
parent5aae42126a062f1d184aff1c8217ef50259ccc53 (diff)
downloadNorthstarLauncher-5472a3630762db2d6880a4dafda9402dbbc872f8.tar.gz
NorthstarLauncher-5472a3630762db2d6880a4dafda9402dbbc872f8.zip
Merge branch 'main' into feat/overhaul-mod-loading-locations
Diffstat (limited to '.github/workflows')
-rw-r--r--.github/workflows/merge-conflict-auto-label.yml3
1 files changed, 2 insertions, 1 deletions
diff --git a/.github/workflows/merge-conflict-auto-label.yml b/.github/workflows/merge-conflict-auto-label.yml
index cf5598a6..abb7cabd 100644
--- a/.github/workflows/merge-conflict-auto-label.yml
+++ b/.github/workflows/merge-conflict-auto-label.yml
@@ -1,10 +1,11 @@
name: Merge Conflict Auto Label
on:
+ workflow_dispatch: # Manual run
push:
branches:
- main
schedule:
- - cron: "10 21 * * *"
+ - cron: "10 21 * * *" # Runs at 21:10; time was chosen based on contributor activity and low GitHub Actions cron load.
jobs:
triage: