From 81c35883789dfc6b8b4f013d5911d0db1b83fd20 Mon Sep 17 00:00:00 2001
From: absidue <48293849+absidue@users.noreply.github.com>
Date: Tue, 26 Mar 2024 01:55:43 +0100
Subject: [PATCH] Skip jobs instead of just steps in the auto merge and
 duplicate label workflows (#4807)

---
 .github/workflows/autoLabelDuplicate.yml | 2 +-
 .github/workflows/autoMerge.yml          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/autoLabelDuplicate.yml b/.github/workflows/autoLabelDuplicate.yml
index 4bbbc9b4c..56fa8681e 100644
--- a/.github/workflows/autoLabelDuplicate.yml
+++ b/.github/workflows/autoLabelDuplicate.yml
@@ -5,10 +5,10 @@ on:
 
 jobs:
   test:
+    if: github.event.comment.author_association == 'MEMBER' || github.event.comment.author_association == 'OWNER'
     runs-on: ubuntu-latest
     steps:
       - name: Check Comment Author
-        if: github.event.comment.author_association == 'MEMBER' || github.event.comment.author_association == 'OWNER' 
         uses: Amwam/issue-comment-action@v1.3.1
         with:
           keywords: '["duplicate of #", "duplicate of https://github.com/FreeTubeApp/FreeTube/issues/", "duplicate of https://github.com/FreeTubeApp/FreeTube/pulls/"]'
diff --git a/.github/workflows/autoMerge.yml b/.github/workflows/autoMerge.yml
index c979c7414..db334ad22 100644
--- a/.github/workflows/autoMerge.yml
+++ b/.github/workflows/autoMerge.yml
@@ -5,11 +5,11 @@ on:
 
 jobs:
   build:
+    if: ${{ !github.event.pull_request.draft && (contains(github.event.pull_request.base.ref, 'development') || contains(github.event.pull_request.base.ref, 'RC')) }}
     runs-on: ubuntu-latest
 
     steps:
     - name: Auto Merge PR
-      if: ${{ !github.event.pull_request.draft && (contains(github.event.pull_request.base.ref, 'development') || contains(github.event.pull_request.base.ref, 'RC')) }}
       run: |
         echo ${{ secrets.PUSH_TOKEN }} >> auth.txt
         gh auth login --with-token < auth.txt