fix

depromeet · Jun 20, 2024 · 58d5b6c · 58d5b6c
1 parent 2d2d975
commit 58d5b6c
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/.github/workflows/auto-merge.yml b/.github/workflows/auto-merge.yml
@@ -32,7 +32,7 @@ jobs:
           echo "MAIN_MERGE=${{ steps.check-labels.outputs.main_merge }}" >> $GITHUB_ENV
 
       - name: Auto Approve if Auto Merge Label Exists
-        if: env.AUTO_MERGE == 'true'
+        if: env.AUTO_MERGE == 'true' && env.NO_AUTO_MERGE == 'false'
         uses: actions/github-script@v6
         with:
           script: |