From 19d9c66abcc12f72175396a6ced44abfa1eeeaa0 Mon Sep 17 00:00:00 2001
From: opficdev <opficdev@gmail.com>
Date: Wed, 18 Mar 2026 21:16:05 +0900
Subject: [PATCH] =?UTF-8?q?chore:=20testflight=20=EB=B0=B0=ED=8F=AC?=
 =?UTF-8?q?=EB=A5=BC=20=ED=83=9C=EA=B7=B8=20=EB=8C=80=EC=8B=A0=20=EB=A0=88?=
 =?UTF-8?q?=EC=9D=B4=EB=B8=94=EB=A1=9C=20=ED=8A=B8=EB=A6=AC=EA=B1=B0=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/testflight.yml | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/testflight.yml b/.github/workflows/testflight.yml
index a51cf6f..52aa8de 100644
--- a/.github/workflows/testflight.yml
+++ b/.github/workflows/testflight.yml
@@ -1,10 +1,11 @@
 name: iOS TestFlight
 
 on:
-  push:
-    tags:
-      - "qa-*"
-  workflow_dispatch:
+  pull_request:
+    types:
+      - closed
+    branches:
+      - develop
 
 env:
   SCHEME: DevLog
@@ -24,12 +25,15 @@ permissions:
 
 jobs:
   testflight:
+    if: github.event.pull_request.merged == true && github.event.pull_request.base.ref == 'develop' && (contains(github.event.pull_request.labels.*.name, 'qa') || contains(github.event.pull_request.labels.*.name, 'qa-local'))
     runs-on: macos-latest
     timeout-minutes: 45
 
     steps:
-      - name: Checkout
+      - name: Checkout merge commit
         uses: actions/checkout@v5
+        with:
+          ref: ${{ github.event.pull_request.merge_commit_sha }}
 
       - name: Install private config files
         uses: ./.github/actions/install-private-config
@@ -74,10 +78,10 @@ jobs:
       - name: Build for TestFlight
         run: bundle exec fastlane testflight_build_only
 
-      - name: Skip TestFlight Upload for Local QA Tag
-        if: github.event_name == 'push' && startsWith(github.ref_name, 'qa-local-')
-        run: echo "Skipping TestFlight upload for local QA tag ${GITHUB_REF_NAME}"
+      - name: Skip TestFlight Upload for Local QA Label
+        if: contains(github.event.pull_request.labels.*.name, 'qa-local')
+        run: echo "Skipping TestFlight upload for PR labeled qa-local"
 
       - name: Upload to TestFlight
-        if: github.event_name != 'push' || !startsWith(github.ref_name, 'qa-local-')
+        if: contains(github.event.pull_request.labels.*.name, 'qa') && !contains(github.event.pull_request.labels.*.name, 'qa-local')
         run: bundle exec fastlane upload_testflight_build