diff --git a/.github/actions/setup-build-env/action.yml b/.github/actions/setup-build-env/action.yml index e6235c29..2500ea22 100644 --- a/.github/actions/setup-build-env/action.yml +++ b/.github/actions/setup-build-env/action.yml @@ -12,6 +12,10 @@ inputs: description: "Whether to include Pulse in cache (false for production builds)" required: false default: "true" + skip-spm-cache: + description: "Skip SPM cache for release builds to avoid simulator artifacts" + required: false + default: "false" runs: using: "composite" @@ -58,6 +62,7 @@ runs: - name: 📦 Cache SPM dependencies id: spm-cache + if: inputs.skip-spm-cache != 'true' uses: actions/cache@v4 with: path: Tuist/.build @@ -66,25 +71,27 @@ runs: tuist-spm-${{ runner.os }}- - name: 🛠 Install tuist dependencies - if: steps.spm-cache.outputs.cache-hit != 'true' + if: inputs.skip-spm-cache == 'true' || steps.spm-cache.outputs.cache-hit != 'true' shell: bash run: tuist install - name: 📊 SPM cache status shell: bash run: | - if [ "${{ steps.spm-cache.outputs.cache-hit }}" == "true" ]; then + if [ "${{ inputs.skip-spm-cache }}" == "true" ]; then + echo "⏭️ SPM cache SKIPPED (release build)" + elif [ "${{ steps.spm-cache.outputs.cache-hit }}" == "true" ]; then echo "✅ SPM cache HIT - skipping tuist cache warm up" else echo "❌ SPM cache MISS - will build dependencies" fi - name: 🏗 Warm up external dependencies (with Pulse) - if: steps.spm-cache.outputs.cache-hit != 'true' && inputs.include-pulse == 'true' + if: (inputs.skip-spm-cache == 'true' || steps.spm-cache.outputs.cache-hit != 'true') && inputs.include-pulse == 'true' shell: bash run: tuist cache ComposableArchitecture Kingfisher Pulse KakaoSDKAuth KakaoSDKCommon GoogleSignIn GoogleSignInSwift - name: 🏗 Warm up external dependencies (without Pulse) - if: steps.spm-cache.outputs.cache-hit != 'true' && inputs.include-pulse != 'true' + if: (inputs.skip-spm-cache == 'true' || steps.spm-cache.outputs.cache-hit != 'true') && inputs.include-pulse != 'true' shell: bash run: tuist cache ComposableArchitecture Kingfisher KakaoSDKAuth KakaoSDKCommon GoogleSignIn GoogleSignInSwift diff --git a/.github/workflows/cd_develop.yml b/.github/workflows/cd_develop.yml index b02892df..177610ca 100644 --- a/.github/workflows/cd_develop.yml +++ b/.github/workflows/cd_develop.yml @@ -22,14 +22,7 @@ jobs: with: keychain-name: ${{ secrets.KEYCHAIN_NAME }} keychain-password: ${{ secrets.KEYCHAIN_PASSWORD }} - - - name: 📦 Cache DerivedData - uses: actions/cache@v4 - with: - path: ~/Library/Developer/Xcode/DerivedData - key: deriveddata-${{ runner.os }}-${{ hashFiles('Tuist/Package.resolved') }} - restore-keys: | - deriveddata-${{ runner.os }}- + skip-spm-cache: "true" - name: 🚀 Deploy to TestFlight (TwixDebug) env: diff --git a/.github/workflows/cd_main.yml b/.github/workflows/cd_main.yml index 52ec6856..92d1156e 100644 --- a/.github/workflows/cd_main.yml +++ b/.github/workflows/cd_main.yml @@ -23,14 +23,7 @@ jobs: keychain-name: ${{ secrets.KEYCHAIN_NAME }} keychain-password: ${{ secrets.KEYCHAIN_PASSWORD }} include-pulse: "false" - - - name: 📦 Cache DerivedData - uses: actions/cache@v4 - with: - path: ~/Library/Developer/Xcode/DerivedData - key: deriveddata-${{ runner.os }}-${{ hashFiles('Tuist/Package.resolved') }} - restore-keys: | - deriveddata-${{ runner.os }}- + skip-spm-cache: "true" - name: 🚀 Deploy to App Store Connect (Twix) env: diff --git a/Projects/App/Project.swift b/Projects/App/Project.swift index 8f99b279..373af6fd 100644 --- a/Projects/App/Project.swift +++ b/Projects/App/Project.swift @@ -31,7 +31,7 @@ private let commonInfoPlist: [String: Plist.Value] = Project.Environment.InfoPli "DEEPLINK_HOST": "$(DEEPLINK_HOST)", "API_BASE_URL": "$(API_BASE_URL)", "NSCameraUsageDescription": "UseCamera", - "CFBundleShortVersionString": "1.1.0" + "CFBundleShortVersionString": "1.1.1" ], uniquingKeysWith: { current, _ in current }) private let commonDependencies: [TargetDependency] = [