Merge pull request #4339 from Expensify/joe-update-xcode-version

Update XCode to fix iOS deploy (cherry picked from commit 8db44bc)
Expensify · Aug 2, 2021 · c0b3d7e · c0b3d7e
1 parent 674dcfe
commit c0b3d7e
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 11 deletions.
diff --git a/.github/workflows/createNewVersion.yml b/.github/workflows/createNewVersion.yml
@@ -10,7 +10,7 @@ on:
 jobs:
   createNewVersion:
     if: github.actor == 'OSBotify'
-    runs-on: macos-latest
+    runs-on: macos-11
 
     steps:
       # Version: 2.3.4

diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
@@ -6,12 +6,12 @@ on:
     branches-ignore: [staging, production]
 
 env:
-  DEVELOPER_DIR: /Applications/Xcode_12.3.app/Contents/Developer
+  DEVELOPER_DIR: /Applications/Xcode_12.5.app/Contents/Developer
 
 jobs:
   test:
     if: github.actor != 'OSBotify'
-    runs-on: macos-latest
+    runs-on: macos-11
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-ruby@v1

diff --git a/.github/workflows/finishReleaseCycle.yml b/.github/workflows/finishReleaseCycle.yml
@@ -53,7 +53,7 @@ jobs:
 
   # Deploy deferred PRs to staging and create a new StagingDeployCash for the next release cycle.
   createNewStagingDeployCash:
-    runs-on: macos-latest
+    runs-on: macos-11
     needs: checkDeployBlockers
     if: ${{ needs.checkDeployBlockers.outputs.hasDeployBlockers == 'false' }}
     steps:

diff --git a/.github/workflows/lockDeploys.yml b/.github/workflows/lockDeploys.yml
@@ -7,7 +7,7 @@ on:
 jobs:
   lockStagingDeploys:
     if: ${{ github.event.label.name == '🔐 LockCashDeploys 🔐' && contains(github.event.issue.labels.*.name, 'StagingDeployCash') && github.actor != 'OSBotify' }}
-    runs-on: macos-latest
+    runs-on: macos-11
     steps:
       # Version: 2.3.4
       - uses: actions/checkout@5a4ac9002d0be2fb38bd78e4b4dbde5606d7042f

diff --git a/.github/workflows/platformDeploy.yml b/.github/workflows/platformDeploy.yml
@@ -10,7 +10,7 @@ on:
 
 env:
   SHOULD_DEPLOY_PRODUCTION: ${{ github.event_name == 'release' }}
-  DEVELOPER_DIR: /Applications/Xcode_12.3.app/Contents/Developer
+  DEVELOPER_DIR: /Applications/Xcode_12.5.app/Contents/Developer
 
 jobs:
   android:
@@ -79,7 +79,7 @@ jobs:
   desktop:
     name: Build and deploy Desktop
     if: github.actor == 'OSBotify'
-    runs-on: macos-latest
+    runs-on: macos-11
     steps:
       - uses: actions/checkout@v2
 
@@ -134,7 +134,7 @@ jobs:
   iOS:
     name: Build and deploy iOS
     if: github.actor == 'OSBotify'
-    runs-on: macos-latest
+    runs-on: macos-11
     steps:
       - uses: actions/checkout@v2
 

diff --git a/ios/Podfile.lock b/ios/Podfile.lock
@@ -564,7 +564,7 @@ PODS:
     - UMCore
   - UMConstantsInterface (6.1.0):
     - UMCore
-  - UMCore (7.1.0)
+  - UMCore (7.1.1)
   - UMFaceDetectorInterface (6.1.0)
   - UMFileSystemInterface (6.1.0)
   - UMFontInterface (6.1.0)
@@ -957,7 +957,7 @@ SPEC CHECKSUMS:
   UMBarCodeScannerInterface: 96a01d81ff0c7febbfefc2d7396db9e7462d8c68
   UMCameraInterface: 8ad433fdadca22703ebeb614d42b814092d38d69
   UMConstantsInterface: 55c79ca258a3ede70480fed85e3843899cd47ea3
-  UMCore: 0da048c9753abcea0042258e6ad0fed77811f7e1
+  UMCore: 063edcab3a9de0c44301fe77af147aa1a654b40f
   UMFaceDetectorInterface: 4db950a25e785796a237bcebb8fff05078c4fb61
   UMFileSystemInterface: 4a92ee36e6c2757833031718f8496690fa931280
   UMFontInterface: 81a951117d03f57aa636fba3992adefd0191f200
@@ -972,4 +972,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: 2092930e33e7aa4d68cdf783d6174465bd3ce380
 
-COCOAPODS: 1.10.1
+COCOAPODS: 1.10.2