Update CI to use macOS-13 and Xcode 14.3

NYPL-Simplified · Oct 11, 2023 · 8863f7d · 8863f7d
1 parent be0624f
commit 8863f7d
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 15 deletions.
diff --git a/.github/workflows/archive-and-upload.yml b/.github/workflows/archive-and-upload.yml
@@ -7,7 +7,7 @@ on:
       - feature/**
 jobs:
   version-check:
-    runs-on: macOS-12
+    runs-on: macOS-13
     env:
       GITHUB_TOKEN: ${{ secrets.IOS_DEV_CI_PAT }}
     steps:
@@ -20,7 +20,7 @@ jobs:
       - name: Check Carthage version
         run: command -v carthage && carthage version
       - name: Checkout main repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           token: ${{ secrets.IOS_DEV_CI_PAT }}
       - name: Add Private Repo Auth
@@ -40,7 +40,7 @@ jobs:
       simplye_changed: ${{ steps.detectapp.outputs.simplye_changed }}
       openebooks_changed: ${{ steps.detectapp.outputs.openebooks_changed }}
   upload-arc:
-    runs-on: macOS-12
+    runs-on: macOS-13
     needs: version-check
     if: needs.version-check.outputs.simplye_changed == '1' || needs.version-check.outputs.openebooks_changed == '1'
     env:
@@ -49,13 +49,13 @@ jobs:
       - name: Check available Xcodes
         run: ls -la /Applications | grep Xcode
       - name: Force Xcode we use for development
-        run: sudo xcode-select -switch /Applications/Xcode_13.4.1.app
+        run: sudo xcode-select -switch /Applications/Xcode_14.3.app
       - name: Install Firebase Tools
         run: npm install -g firebase-tools
       - name: Check Firebase Tools version
         run: command -v firebase && firebase --version
       - name: Checkout main repo and submodules
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           submodules: true
           token: ${{ secrets.IOS_DEV_CI_PAT }}
@@ -72,7 +72,7 @@ jobs:
           GITHUB_REPO_OWNER: ${{ github.repository_owner }}
       - name: Checkout Adobe RMSDK
         if: needs.version-check.outputs.simplye_changed == '1'
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           repository: NYPL-Simplified/DRM-iOS-AdeptConnector
           token: ${{ secrets.IOS_DEV_CI_PAT }}

diff --git a/.github/workflows/non-drm-build.yml b/.github/workflows/non-drm-build.yml
@@ -3,16 +3,16 @@ on:
   pull_request:
 jobs:
   build:
-    runs-on: macOS-12
+    runs-on: macOS-13
     steps:
       - name: Print System Info
         run: uname -a
       - name: Check available Xcodes
         run: ls -la /Applications | grep Xcode
       - name: Force Xcode we use for development
-        run: sudo xcode-select -switch /Applications/Xcode_13.4.1.app
+        run: sudo xcode-select -switch /Applications/Xcode_14.3.app
       - name: Checkout main repo
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       - name: Set up repo for nonDRM build
         run: exec ./scripts/setup-repo-nodrm.sh
         env:

diff --git a/.github/workflows/unit-testing.yml b/.github/workflows/unit-testing.yml
@@ -3,7 +3,7 @@ on:
   pull_request:
 jobs:
   build-and-test:
-    runs-on: macOS-12
+    runs-on: macOS-13
     if: github.event.pull_request.head.repo.full_name == github.repository
     env:
       GITHUB_TOKEN: ${{ secrets.IOS_DEV_CI_PAT }}
@@ -13,14 +13,14 @@ jobs:
       - name: Check available Xcodes
         run: ls -la /Applications | grep Xcode
       - name: Force Xcode we use for development
-        run: sudo xcode-select -switch /Applications/Xcode_13.4.1.app
+        run: sudo xcode-select -switch /Applications/Xcode_14.3.app
       - name: Checkout main repo and submodules
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           submodules: true
           token: ${{ secrets.IOS_DEV_CI_PAT }}
       - name: Checkout Adobe RMSDK
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           repository: NYPL-Simplified/DRM-iOS-AdeptConnector
           token: ${{ secrets.IOS_DEV_CI_PAT }}

diff --git a/scripts/xcode-build-nodrm.sh b/scripts/xcode-build-nodrm.sh
@@ -17,6 +17,6 @@ echo "Building SimplyE without DRM support..."
 
 xcodebuild -project Simplified.xcodeproj \
            -scheme SimplyE-noDRM \
-           -destination platform=iOS\ Simulator,OS=15.5,name=iPhone\ 13\ Pro\
+           -destination platform=iOS\ Simulator,OS=16.4,name=iPhone\ 14\ Pro\
            clean build | \
            if command -v xcpretty &> /dev/null; then xcpretty; else cat; fi
diff --git a/scripts/xcode-test.sh b/scripts/xcode-test.sh
@@ -22,7 +22,7 @@ echo "Running unit tests for $APP_NAME..."
 # packages with the version checked in in Package.resolved
 xcodebuild -project "$PROJECT_NAME" \
            -scheme "$SCHEME" \
-           -destination platform=iOS\ Simulator,OS=15.5,name=iPhone\ 13 \
+           -destination platform=iOS\ Simulator,OS=16.4,name=iPhone\ 14 \
            -disableAutomaticPackageResolution \
            clean test | \
            if command -v xcpretty &> /dev/null; then xcpretty; else cat; fi