From 9fd2e1dd669ecf472e06073982ca690272d4c39a Mon Sep 17 00:00:00 2001 From: cmd-ob Date: Fri, 9 Jan 2026 15:33:51 +0000 Subject: [PATCH 1/3] fix: update CocoaPods cache restoration to use Pods directory --- .github/actions/setup-e2e-env/action.yml | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/.github/actions/setup-e2e-env/action.yml b/.github/actions/setup-e2e-env/action.yml index b71f8081..ea34b19a 100644 --- a/.github/actions/setup-e2e-env/action.yml +++ b/.github/actions/setup-e2e-env/action.yml @@ -329,16 +329,13 @@ runs: run: sudo xcode-select -s "/Applications/Xcode_$XCODE_VERSION.app" shell: bash - - name: Restore CocoaPods specs cache + - name: Restore CocoaPods Pods cache if: ${{ inputs.platform == 'ios' }} - id: cocoapods-specs-cache uses: actions/cache@v4 with: - path: ~/.cocoapods/repos - key: ${{ runner.os }}-cocoapods-specs-${{ hashFiles('ios/Podfile.lock') }} - restore-keys: | - ${{ runner.os }}-cocoapods-specs- - continue-on-error: true # Don't fail if cache restoration has issues + path: ios/Pods + key: ${{ runner.os }}-pods-${{ hashFiles('ios/Podfile.lock') }} + continue-on-error: true # Don't fail if cache restoration has issues # Install CocoaPods w/ cached bundler environment - name: Install CocoaPods via bundler From dccdd39a5137f3bdca6ddf92ba9ed2fa9d3c96b0 Mon Sep 17 00:00:00 2001 From: cmd-ob Date: Fri, 9 Jan 2026 15:39:22 +0000 Subject: [PATCH 2/3] lint fix --- .github/actions/setup-e2e-env/action.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/actions/setup-e2e-env/action.yml b/.github/actions/setup-e2e-env/action.yml index ea34b19a..f9ec87ad 100644 --- a/.github/actions/setup-e2e-env/action.yml +++ b/.github/actions/setup-e2e-env/action.yml @@ -335,7 +335,7 @@ runs: with: path: ios/Pods key: ${{ runner.os }}-pods-${{ hashFiles('ios/Podfile.lock') }} - continue-on-error: true # Don't fail if cache restoration has issues + continue-on-error: true # Don't fail if cache restoration has issues # Install CocoaPods w/ cached bundler environment - name: Install CocoaPods via bundler From e613b9bc4788e499df33ceb26bb2fda99bf79f0a Mon Sep 17 00:00:00 2001 From: cmd-ob Date: Fri, 9 Jan 2026 15:50:16 +0000 Subject: [PATCH 3/3] fix: update CocoaPods cache restoration to use specs and clear stale trunk --- .github/actions/setup-e2e-env/action.yml | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/.github/actions/setup-e2e-env/action.yml b/.github/actions/setup-e2e-env/action.yml index f9ec87ad..16e7bb29 100644 --- a/.github/actions/setup-e2e-env/action.yml +++ b/.github/actions/setup-e2e-env/action.yml @@ -329,14 +329,22 @@ runs: run: sudo xcode-select -s "/Applications/Xcode_$XCODE_VERSION.app" shell: bash - - name: Restore CocoaPods Pods cache + - name: Restore CocoaPods specs cache if: ${{ inputs.platform == 'ios' }} + id: cocoapods-specs-cache uses: actions/cache@v4 with: - path: ios/Pods - key: ${{ runner.os }}-pods-${{ hashFiles('ios/Podfile.lock') }} + path: ~/.cocoapods/repos + key: ${{ runner.os }}-cocoapods-specs-${{ hashFiles('ios/Podfile.lock') }} + restore-keys: | + ${{ runner.os }}-cocoapods-specs- continue-on-error: true # Don't fail if cache restoration has issues + - name: Clear CocoaPods trunk to prevent stale specs + if: ${{ inputs.platform == 'ios' }} + run: pod repo remove trunk || true + shell: bash + # Install CocoaPods w/ cached bundler environment - name: Install CocoaPods via bundler if: ${{ inputs.platform == 'ios'}}