Merge branch 'use-hardcoded-client-id-tests' into cleanup-ui-tests

braintree · Oct 25, 2023 · e623d78 · e623d78
2 parents 858f73d + 0f6cf96
commit e623d78
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 14 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -2,23 +2,23 @@ name: Build
 on: [pull_request, workflow_dispatch]
 jobs:
   cocoapods:
-    name: CocoaPods (Xcode 15)
+    name: CocoaPods (Xcode 14)
     runs-on: macOS-13
     steps:
       - name: Check out repository
         uses: actions/checkout@v2
-      - name: Use Xcode 15
-        run: sudo xcode-select -switch /Applications/Xcode_15.0.app
+      - name: Use Xcode 14.3.1
+        run: sudo xcode-select -switch /Applications/Xcode_14.3.1.app
       - name: Run pod lib lint
         run: pod lib lint
   spm:
-    name: SPM (Xcode 15)
+    name: SPM (Xcode 14)
     runs-on: macOS-13
     steps:
       - name: Check out repository
         uses: actions/checkout@v2
-      - name: Use Xcode 15
-        run: sudo xcode-select -switch /Applications/Xcode_15.0.app
+      - name: Use Xcode 14.3.1
+        run: sudo xcode-select -switch /Applications/Xcode_14.3.1.app
       - name: Use current branch
         run: sed -i '' 's/branch = .*/branch = \"'"$GITHUB_HEAD_REF"'\";/' SampleApps/SPMTest/SPMTest.xcodeproj/project.pbxproj
       - name: Run swift package resolve

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -15,8 +15,8 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Use Xcode 15
-        run: sudo xcode-select -switch /Applications/Xcode_15.0.app
+      - name: Use Xcode 14.3.1
+        run: sudo xcode-select -switch /Applications/Xcode_14.3.1.app
 
       - name: Check for unreleased section in changelog
         run: grep "## unreleased" CHANGELOG.md || (echo "::error::No unreleased section found in CHANGELOG"; exit 1)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -7,17 +7,17 @@ jobs:
     steps:
       - name: Checkout repository
         uses: actions/checkout@v2
-      - name: Use Xcode 15
-        run: sudo xcode-select -switch /Applications/Xcode_15.0.app
+      - name: Use Xcode 14.3.1
+        run: sudo xcode-select -switch /Applications/Xcode_14.3.1.app
       - name: Run Unit Tests
-        run: set -o pipefail && xcodebuild -workspace 'BraintreeDropIn.xcworkspace' -sdk 'iphonesimulator' -configuration 'Debug' -scheme 'UnitTests' -destination 'name=iPhone 15,platform=iOS Simulator'  test  | xcpretty
+        run: set -o pipefail && xcodebuild -workspace 'BraintreeDropIn.xcworkspace' -sdk 'iphonesimulator' -configuration 'Debug' -scheme 'UnitTests' -destination 'name=iPhone 14,OS=16.4,platform=iOS Simulator'  test  | xcpretty
   ui_test_job:
     name: UI
     runs-on: macOS-13
     steps:
       - name: Checkout repository
         uses: actions/checkout@v2
-      - name: Use Xcode 15
-        run: sudo xcode-select -switch /Applications/Xcode_15.0.app
+      - name: Use Xcode 14.3.1
+        run: sudo xcode-select -switch /Applications/Xcode_14.3.1.app
       - name: Run UI Tests
-        run: set -o pipefail && xcodebuild -workspace 'BraintreeDropIn.xcworkspace' -sdk 'iphonesimulator' -configuration 'Debug' -scheme 'UITests' -destination 'name=iPhone 15,platform=iOS Simulator'  test  | xcpretty
+        run: set -o pipefail && xcodebuild -workspace 'BraintreeDropIn.xcworkspace' -sdk 'iphonesimulator' -configuration 'Debug' -scheme 'UITests' -destination 'name=iPhone 14,OS=16.4,platform=iOS Simulator'  test  | xcpretty