Merge pull request #162 from YAPP-Github/develop

release 1.0.4
YAPP-Github · Nov 21, 2024 · 0230093 · 0230093
2 parents ea53630 + b437b25
commit 0230093
Show file tree

Hide file tree

Showing 165 changed files with 4,294 additions and 2,627 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/workflow_test.yml → .github/workflows/develop_hotfix.yml b/.github/workflows/workflow_test.yml → .github/workflows/develop_hotfix.yml
@@ -1,14 +1,17 @@
 # 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: workflow_test
+name: develop-hotfix
 
 on:
   push:
-    branches: [ "workflow/*" ]
+    branches: [ "develop" ]
+
+  workflow_dispatch:
 
 jobs:
   build:
+    if: startsWith(github.event.head_commit.message, '[hotfix]')
     runs-on: macos-latest
 
     steps:
@@ -17,12 +20,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: |
@@ -33,24 +36,13 @@ jobs:
     - name: initial tuist
       run: mise install tuist
 
-    - 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
-
-    - name: Build Test
-      run: fastlane build
-
-    - name: Release Generate
+    - 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:
@@ -59,9 +51,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/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/Makefile b/Makefile
@@ -52,13 +52,17 @@ download-privates:
 	@if [ ! -d "Pokit_iOS_Private" ]; then \
 		git clone [email protected]: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/xcconfig/Debug-Share.xcconfig xcconfig/Debug-Share.xcconfig; \
+		cp Pokit_iOS_Private/xcconfig/Release-Share.xcconfig xcconfig/Release-Share.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; \
+		cp Pokit_iOS_Private/GoogleService-Info.plist Projects/App/ShareExtension/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/AppTests/Resources/info.plist b/Projects/App/AppTests/Resources/info.plist
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <key>ENABLE_TESTING_SEARCH_PATHS</key>
+    <string>YES</string>
+</dict>
+</plist>
diff --git a/Projects/App/AppTests/Sources/AppTests.swift b/Projects/App/AppTests/Sources/AppTests.swift
@@ -0,0 +1,10 @@
+import ComposableArchitecture
+import XCTest
+
+@testable import App
+
+final class AppTests: XCTestCase {
+    func test() {
+
+    }
+}