Merge pull request #136 from YAPP-Github/feature/#135-cicd-improvement

CI/CD 및 코드 사이닝 개선
YAPP-Github · Oct 6, 2024 · c0ab92f · c0ab92f
2 parents d9704db + 57f24ab
commit c0ab92f
Show file tree

Hide file tree

Showing 17 changed files with 162 additions and 158 deletions.
diff --git a/.github/workflows/hotfix.yml → .github/workflows/appstore_release.yml b/.github/workflows/hotfix.yml → .github/workflows/appstore_release.yml
@@ -1,11 +1,12 @@
 # This workflow will build a Swift project
 # For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-swift
 
-name: hotfix
+name: appstore-release
 
 on:
-  push:
-    branches: [ "hotfix/*" ]
+  pull_request:
+    branches:
+      - main
 
 jobs:
   build:
@@ -17,12 +18,12 @@ jobs:
     - name: Set up Xcode
       uses: maxim-lobanov/setup-xcode@v1
       with:
-        xcode-version: '15.4'
+        xcode-version: latest-stable
 
-    # - uses: shimataro/ssh-key-action@v2
-    #   with:
-    #     key: ${{ secrets.SSH_KEY }}
-    #     known_hosts: ${{ secrets.KNOWN_HOSTS }}
+    - uses: shimataro/ssh-key-action@v2
+      with:
+        key: ${{ secrets.SSH_KEY }}
+        known_hosts: ${{ secrets.KNOWN_HOSTS }}
 
     - name: initial mise
       run: |
@@ -36,10 +37,10 @@ jobs:
     - name: Generate Project
       env:
         MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
-        MATCH_URL: ${{ secrets.MATCH_URL }}
-        APP_STORE_CONNECT_TEAM_ID: ${{ secrets.APP_STORE_CONNECT_TEAM_ID }}
         DEVELOPMENT_TEAM: ${{ secrets.DEVELOPMENT_TEAM }}
-      run: fastlane generate
+      run: |
+        fastlane appstore_profile
+        make release
 
     - name: Build Archive
       env:
@@ -48,9 +49,9 @@ jobs:
         APP_STORE_CONNECT_API: ${{ secrets.APP_STORE_CONNECT_API }}
       run: fastlane archive
 
-    - name: Beta Release
+    - name: Appstore Release
       env:
         APP_STORE_CONNECT_KEY_ID: ${{ secrets.APP_STORE_CONNECT_KEY_ID }}
         APP_STORE_CONNECT_ISSUER_ID: ${{ secrets.APP_STORE_CONNECT_ISSUER_ID }}
         APP_STORE_CONNECT_API: ${{ secrets.APP_STORE_CONNECT_API }}
-      run: fastlane release
+      run: fastlane appstore_release
diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml
@@ -5,7 +5,10 @@ name: build-test
 
 on:
   pull_request:
-    branches: [ "develop" ]
+    branches:
+      - develop
+
+  workflow_dispatch:
 
 jobs:
   build:
@@ -17,7 +20,7 @@ jobs:
     - name: Set up Xcode
       uses: maxim-lobanov/setup-xcode@v1
       with:
-        xcode-version: '15.4'
+        xcode-version: latest-stable
 
     - uses: shimataro/ssh-key-action@v2
       with:
@@ -36,10 +39,10 @@ jobs:
     - name: Test Generate
       env:
         MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
-        MATCH_URL: ${{ secrets.MATCH_URL }}
-        APP_STORE_CONNECT_TEAM_ID: ${{ secrets.APP_STORE_CONNECT_TEAM_ID }}
         DEVELOPMENT_TEAM: ${{ secrets.DEVELOPMENT_TEAM }}
-      run: fastlane test
+      run: |
+        fastlane development_profile
+        make test
 
     - name: Build Test
       run: fastlane build
diff --git a/.github/workflows/release_update.yml b/.github/workflows/release_update.yml
@@ -0,0 +1,31 @@
+# This workflow will build a Swift project
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-swift
+
+name: release-update
+
+on:
+  pull_request:
+    branches:
+      - main
+    types:
+      - closed
+
+jobs:
+  release-update:
+    if: ${{ github.event.pull_request.merged == true }}
+    runs-on: macos-latest
+
+    steps:
+    - uses: actions/checkout@v4
+
+    - name: Install GitHub CLI
+      run: sudo apt-get install gh
+
+    - name: Update Release
+      env:
+        APP_STORE_CONNECT_KEY_ID: ${{ secrets.APP_STORE_CONNECT_KEY_ID }}
+        APP_STORE_CONNECT_ISSUER_ID: ${{ secrets.APP_STORE_CONNECT_ISSUER_ID }}
+        APP_STORE_CONNECT_API: ${{ secrets.APP_STORE_CONNECT_API }}
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        PR_NUMBER: ${{ github.event.pull_request.number }}
+      run: fastlane update_github_release
diff --git a/.github/workflows/testflight_release.yml b/.github/workflows/testflight_release.yml
@@ -1,14 +1,20 @@
 # This workflow will build a Swift project
 # For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-swift
 
-name: testflight_release
+name: testflight-release
 
 on:
-  push:
-    branches: [ "develop" ]
+  pull_request:
+    branches:
+      - develop
+    types:
+      - closed
+
+  workflow_dispatch:
 
 jobs:
   build:
+    if: ${{ github.event_name == 'workflow_dispatch' || github.event.pull_request.merged == true }}
     runs-on: macos-latest
 
     steps:
@@ -17,7 +23,7 @@ jobs:
     - name: Set up Xcode
       uses: maxim-lobanov/setup-xcode@v1
       with:
-        xcode-version: '15.4'
+        xcode-version: latest-stable
 
     - uses: shimataro/ssh-key-action@v2
       with:
@@ -36,10 +42,10 @@ jobs:
     - name: Generate Project
       env:
         MATCH_PASSWORD: ${{ secrets.MATCH_PASSWORD }}
-        MATCH_URL: ${{ secrets.MATCH_URL }}
-        APP_STORE_CONNECT_TEAM_ID: ${{ secrets.APP_STORE_CONNECT_TEAM_ID }}
         DEVELOPMENT_TEAM: ${{ secrets.DEVELOPMENT_TEAM }}
-      run: fastlane generate
+      run: |
+        fastlane appstore_profile
+        make release
 
     - name: Build Archive
       env:
@@ -48,9 +54,9 @@ jobs:
         APP_STORE_CONNECT_API: ${{ secrets.APP_STORE_CONNECT_API }}
       run: fastlane archive
 
-    - name: Beta Release
+    - name: Testflight Release
       env:
         APP_STORE_CONNECT_KEY_ID: ${{ secrets.APP_STORE_CONNECT_KEY_ID }}
         APP_STORE_CONNECT_ISSUER_ID: ${{ secrets.APP_STORE_CONNECT_ISSUER_ID }}
         APP_STORE_CONNECT_API: ${{ secrets.APP_STORE_CONNECT_API }}
-      run: fastlane release
+      run: fastlane testflight_release
diff --git a/.github/workflows/workflow_test.yml b/.github/workflows/workflow_test.yml
diff --git a/Makefile b/Makefile
@@ -52,13 +52,14 @@ download-privates:
 	@if [ ! -d "Pokit_iOS_Private" ]; then \
 		git clone git@github.com:stealmh/Pokit_iOS_Private.git; \
 	fi
-	@if [ -f "Pokit_iOS_Private/xcconfig/Secret.xcconfig" ]; then \
+	@if [ -f "Pokit_iOS_Private/xcconfig/Debug.xcconfig" ] && [ -f "Pokit_iOS_Private/xcconfig/Release.xcconfig" ]; then \
 		mkdir -p xcconfig; \
-		cp Pokit_iOS_Private/xcconfig/Secret.xcconfig xcconfig/Secret.xcconfig; \
+		cp Pokit_iOS_Private/xcconfig/Debug.xcconfig xcconfig/Debug.xcconfig; \
+		cp Pokit_iOS_Private/xcconfig/Release.xcconfig xcconfig/Release.xcconfig; \
 		cp Pokit_iOS_Private/auth/AuthKey.p8 Projects/CoreKit/Resources/AuthKey.p8; \
 		cp Pokit_iOS_Private/GoogleService-Info.plist Projects/App/Resources/GoogleService-Info.plist; \
 		rm -rf Pokit_iOS_Private; \
-		echo "✅ Secret 파일을 성공적으로 다운로드하고 Pokit_iOS_Private 폴더를 삭제했습니다."; \
+		echo "✅ Debug.xcconfig와 Release.xcconfig 파일을 성공적으로 다운로드하고 Pokit_iOS_Private 폴더를 삭제했습니다."; \
 	else \
-		echo "❌ Secret.xcconfig 파일을 찾을 수 없습니다."; \
+		echo "❌ Debug.xcconfig 또는 Release.xcconfig 파일을 찾을 수 없습니다." && exit 1; \
 	fi
diff --git a/Projects/App/Project.swift b/Projects/App/Project.swift
@@ -37,17 +37,13 @@ let project = Project(
                 .external(name: "FirebaseMessaging")
             ],
             settings: .settings(
-                base: [
-                    "OTHER_LDFLAGS": "$(inherited) -ObjC",
-                    "CODE_SIGN_IDENTITY": "Apple Distribution",
-                    "PROVISIONING_PROFILE_SPECIFIER": "match AppStore com.pokitmons.pokit 1721720816",
-                    "PROVISIONING_PROFILE": "match AppStore com.pokitmons.pokit 1721720816",
-                    "DEVELOPMENT_TEAM": "\(developmentTeam ?? "")"
-                ],
-                configurations: [
-                    .debug(name: "Debug", xcconfig: .relativeToRoot("xcconfig/Secret.xcconfig")),
-                    .release(name: "Release", xcconfig: .relativeToRoot("xcconfig/Secret.xcconfig"))
-                ]
+                .release(
+                    name: "Release",
+                    settings: [
+                        "CODE_SIGN_IDENTITY": "Apple Distribution"
+                    ],
+                    xcconfig: .relativeToRoot("xcconfig/Release.xcconfig")
+                )
             )
         )
     ]

diff --git a/Projects/CoreKit/Project.swift b/Projects/CoreKit/Project.swift
@@ -37,19 +37,10 @@ let coreKit: Target = .target(
         .external(name: "KakaoSDKShare"),
         .external(name: "KakaoSDKTemplate"),
     ],
-    settings: .settings(
-        base: [
-            "OTHER_LDFLAGS": "$(inherited) -ObjC",
-        ],
-        configurations: [
-            .debug(name: "Debug", xcconfig: .relativeToRoot("xcconfig/Secret.xcconfig")),
-            .release(name: "Release", xcconfig: .relativeToRoot("xcconfig/Secret.xcconfig"))
-        ]
-    )
+    settings: .settings()
 )
 
 let project = Project(
     name: "CoreKit",
-    settings: .settings,
     targets: [coreKit]
 )
diff --git a/Projects/DSKit/Project.swift b/Projects/DSKit/Project.swift
@@ -26,7 +26,8 @@ let project = Project(
                 // TODO: 의존성 추가
                 .project(target: "Util", path: .relativeToRoot("Projects/Util")),
                 .external(name: "NukeUI")
-            ]
+            ],
+            settings: .settings()
         )
     ]
 )
diff --git a/Projects/Domain/Project.swift b/Projects/Domain/Project.swift
@@ -26,7 +26,7 @@ let project = Project(
                 .project(target: "SharedThirdPartyLib", path: .relativeToRoot("Projects/SharedThirdPartyLib")),
                 .project(target: "CoreKit", path: .relativeToRoot("Projects/CoreKit"))
             ],
-            settings: .settings
+            settings: .settings()
         )
     ]
 )
diff --git a/Projects/SharedThirdPartyLib/Project.swift b/Projects/SharedThirdPartyLib/Project.swift
@@ -24,7 +24,7 @@ let project = Project(
                 // TODO: 의존성 추가
                 .external(name: "ComposableArchitecture")
             ],
-            settings: .settings
+            settings: .settings()
         )
     ]
 )
diff --git a/Projects/Util/Project.swift b/Projects/Util/Project.swift
@@ -22,7 +22,8 @@ let project = Project(
             sources: ["Sources/**"],
             dependencies: [
                 // TODO: 의존성 추가
-            ]
+            ],
+            settings: .settings()
         )
     ]
 )
diff --git a/Tuist/ProjectDescriptionHelpers/Settings+Extension.swift b/Tuist/ProjectDescriptionHelpers/Settings+Extension.swift
@@ -8,11 +8,21 @@
 import ProjectDescription
 
 public extension Settings {
-    static var settings: Settings {
-        return .settings(
+    static func settings(_ release: Configuration? = nil) -> Settings {
+        var settings: Settings = .settings(
             base: [
                 "OTHER_LDFLAGS": "$(inherited) -ObjC",
+                "CODE_SIGN_STYLE": "Manual"
+            ],
+            configurations: [
+                .debug(name: "Debug", xcconfig: .relativeToRoot("xcconfig/Debug.xcconfig"))
             ]
         )
+
+        if let release {
+            settings.configurations.append(release)
+        }
+
+        return settings
     }
 }
diff --git a/Tuist/ProjectDescriptionHelpers/Target+Extension.swift b/Tuist/ProjectDescriptionHelpers/Target+Extension.swift
@@ -26,7 +26,7 @@ public extension Target {
             sources: ["\(name)/Sources/**"],
             resources: resources,
             dependencies: dependencies,
-            settings: .settings
+            settings: .settings()
         )
     }
 
@@ -44,7 +44,7 @@ public extension Target {
             deploymentTargets: .appMinimunTarget,
             sources: ["Sources/\(name)/Sources/**"],
             dependencies: dependencies,
-            settings: .settings
+            settings: .settings()
         )
     }
 }