Auto merge Fehler repariert.
This commit is contained in:
@@ -8,6 +8,8 @@ on:
|
||||
jobs:
|
||||
merge:
|
||||
runs-on: ubuntu-latest
|
||||
outputs:
|
||||
reason: ${{ steps.check.outputs.reason }}
|
||||
steps:
|
||||
- name: Checkout repository
|
||||
uses: actions/checkout@v4
|
||||
@@ -28,9 +30,15 @@ jobs:
|
||||
id: check
|
||||
run: |
|
||||
git fetch origin
|
||||
if [ $(git rev-list --count origin/staging..origin/main) -gt 0 ]; then
|
||||
COUNT=$(git rev-list --count origin/staging..origin/main)
|
||||
if [ "$COUNT" -gt 0 ]; then
|
||||
echo "reason=ok" >> $GITHUB_OUTPUT
|
||||
echo "❌ Staging is behind main and requires manual merging."
|
||||
exit 1
|
||||
elif [ "$COUNT" -eq 0 ]; then
|
||||
echo "reason=identical" >> $GITHUB_OUTPUT
|
||||
echo "✅ Staging and main are identical. Nothing to do."
|
||||
exit 42
|
||||
fi
|
||||
|
||||
- name: Create PR from staging to main
|
||||
@@ -53,7 +61,7 @@ jobs:
|
||||
|
||||
notify_failure:
|
||||
needs: merge
|
||||
if: failure()
|
||||
if: failure() && needs.merge.outputs.reason != 'identical'
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- name: Send Discord notification on failure
|
||||
|
||||
Reference in New Issue
Block a user