Update workflow
This commit is contained in:
@@ -2,7 +2,7 @@ name: Auto Merge Staging into Main
|
||||
|
||||
on:
|
||||
schedule:
|
||||
- cron: '0 2 * * *' # 2:00 UTC = 4:00 Europäische Zeit
|
||||
- cron: '0 2 * * *' # 2:00 UTC = 4:00 CET
|
||||
workflow_dispatch:
|
||||
|
||||
jobs:
|
||||
@@ -27,8 +27,9 @@ jobs:
|
||||
- name: Check if main has commits not in staging
|
||||
id: check
|
||||
run: |
|
||||
if ! git merge-base --is-ancestor origin/staging origin/main; then
|
||||
echo "Main hat neuere Commits als Staging. Merge wird abgebrochen."
|
||||
git fetch origin
|
||||
if [ $(git rev-list --count origin/main..origin/staging) -gt 0 ]; then
|
||||
echo "❌ Staging ist hinter Main und benötigt ein Merge."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
|
||||
Reference in New Issue
Block a user