Workflows uses Xcode 15 (#316)

* Workflows uses Xcode 15 * Run workflows when workflow changes * Fixes UI tests * Makes destination more specific * Updates DEVELOPER_DIR * Update build_and_test.yml * Uses iPhone 14
simonbs · Sep 24, 2023 · 0ba9b6c · 0ba9b6c
1 parent 9277498
commit 0ba9b6c
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 54 deletions.
diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml
@@ -4,14 +4,15 @@ on:
   pull_request:
     branches: [ main ]
     paths:
+      - '.github/workflows/build_and_test.yml'
       - 'Sources/**'
       - '!Sources/Runestone/Documentation.docc/**'
       - 'Tests/**'
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 env:
-  DEVELOPER_DIR: /Applications/Xcode_14.3.1.app/Contents/Developer
+  DEVELOPER_DIR: /Applications/Xcode_15.0.app/Contents/Developer
 jobs:
   build:
     name: Build and test on iPhone 14
@@ -23,10 +24,13 @@ jobs:
           submodules: recursive
       - name: Build
         run: |
-          xcodebuild build-for-testing -scheme Runestone -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 14'
+          xcodebuild build-for-testing\
+            -scheme Runestone\
+            -sdk iphonesimulator\
+            -destination "platform=iOS Simulator,name=iPhone 14 Pro,OS=17.0"
       - name: Test
-        env:
-          scheme: ${{ 'default' }}
-          platform: ${{ 'iOS Simulator' }}
         run: |
-          xcodebuild test-without-building -scheme Runestone -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 14'
+          xcodebuild test-without-building\
+            -scheme Runestone\
+            -sdk iphonesimulator\
+            -destination "platform=iOS Simulator,name=iPhone 14 Pro,OS=17.0"
diff --git a/.github/workflows/build_example_project.yml b/.github/workflows/build_example_project.yml
@@ -4,12 +4,13 @@ on:
   pull_request:
     branches: [ main ]
     paths:
+      - '.github/workflows/build_example_project.yml'
       - 'Example/**'
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 env:
-  DEVELOPER_DIR: /Applications/Xcode_14.3.1.app/Contents/Developer
+  DEVELOPER_DIR: /Applications/Xcode_15.0.app/Contents/Developer
 jobs:
   build:
     name: Build example project for iPhone 14
@@ -21,4 +22,8 @@ jobs:
           submodules: recursive
       - name: Build
         run: |
-          xcodebuild build -project Example/Example.xcodeproj -scheme Example -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 14'
+          xcodebuild build\
+            -project Example/Example.xcodeproj\
+            -scheme Example\
+            -sdk iphonesimulator\
+            -destination "platform=iOS Simulator,name=iPhone 14 Pro,OS=17.0"
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
@@ -8,7 +8,7 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 env:
-  DEVELOPER_DIR: /Applications/Xcode_14.3.1.app/Contents/Developer
+  DEVELOPER_DIR: /Applications/Xcode_15.0.app/Contents/Developer
 jobs:
   analyze:
     name: Analyze
@@ -29,7 +29,11 @@ jobs:
         with:
           languages: ${{ matrix.language }}
       - name: Build
-        run: xcodebuild -scheme Runestone -sdk iphonesimulator -destination 'platform=iOS Simulator,name=iPhone 14'
+        run: |
+          xcodebuild\
+            -scheme Runestone\
+            -sdk iphonesimulator\
+            -destination "platform=iOS Simulator,name=iPhone 14 Pro,OS=17.0"
       - name: Perform CodeQL Analysis
         uses: github/codeql-action/analyze@v2
         with:

diff --git a/.github/workflows/deploy_documentation.yml b/.github/workflows/deploy_documentation.yml
@@ -9,7 +9,7 @@ concurrency:
   group: "pages"
   cancel-in-progress: true
 env:
-  DEVELOPER_DIR: /Applications/Xcode_14.3.1.app/Contents/Developer
+  DEVELOPER_DIR: /Applications/Xcode_15.0.app/Contents/Developer
 jobs:
   build:
     runs-on: macos-13

diff --git a/.github/workflows/ui_tests.yml b/.github/workflows/ui_tests.yml
@@ -4,14 +4,15 @@ on:
   pull_request:
     branches: [ main ]
     paths:
+      - '.github/workflows/ui_tests.yml'
       - 'Sources/**'
       - '!Sources/Runestone/Documentation.docc/**'
       - 'UITests/HostUITests/**'
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
 env:
-  DEVELOPER_DIR: /Applications/Xcode_14.3.1.app/Contents/Developer
+  DEVELOPER_DIR: /Applications/Xcode_15.0.app/Contents/Developer
 jobs:
   run_korean_tests:
     name: Run Korean tests
@@ -28,7 +29,7 @@ jobs:
       - name: Disable "Use the Same Keyboard Language as macOS"
         run: defaults write com.apple.iphonesimulator EnableKeyboardSync -bool NO
       - name: Create Simulator
-        run: xcrun simctl create "${SIMULATOR_NAME}" "iPhone 8"
+        run: xcrun simctl create "${SIMULATOR_NAME}" "iPhone 13" "iOS15.5"
       - name: Find Simulator UDID
         run: |
           TMP_SIMULATOR_UDID=`xcrun simctl list --json devices | jq -r ".devices | flatten | .[] | select(.name == \"${SIMULATOR_NAME}\").udid"`
@@ -92,7 +93,7 @@ jobs:
       - name: Disable "Use the Same Keyboard Language as macOS"
         run: defaults write com.apple.iphonesimulator EnableKeyboardSync -bool NO
       - name: Create Simulator
-        run: xcrun simctl create "${SIMULATOR_NAME}" "iPhone 8"
+        run: xcrun simctl create "${SIMULATOR_NAME}" "iPhone 13" "iOS15.5"
       - name: Find Simulator UDID
         run: |
           TMP_SIMULATOR_UDID=`xcrun simctl list --json devices | jq -r ".devices | flatten | .[] | select(.name == \"${SIMULATOR_NAME}\").udid"`

diff --git a/Scripts/run-ui-test-chinese.sh b/Scripts/run-ui-test-chinese.sh
@@ -6,7 +6,7 @@ PROJECT_PATH="${SCRIPT_PATH}/../UITests/UITests.xcodeproj"
 # Disable "Use the Same Keyboard Language as macOS" in Simulator.app.
 defaults write com.apple.iphonesimulator EnableKeyboardSync -bool NO
 # Create the simulator we will use for the tests.
-xcrun simctl create "${SIMULATOR_NAME}" "iPhone 8" 2> /dev/null
+xcrun simctl create "${SIMULATOR_NAME}" "iPhone 13" "iOS15.5" 2> /dev/null
 # Find the UDID of the newly created simulator.
 SIMULATOR_UDID=`xcrun simctl list --json devices | jq -r ".devices | flatten | .[] | select(.name == \"${SIMULATOR_NAME}\").udid"`
 # Edit the simulator's .GlobalPreferences.plist to use the Chinese language.

diff --git a/Scripts/run-ui-test-korean.sh b/Scripts/run-ui-test-korean.sh
@@ -6,7 +6,7 @@ PROJECT_PATH="${SCRIPT_PATH}/../UITests/UITests.xcodeproj"
 # Disable "Use the Same Keyboard Language as macOS" in Simulator.app.
 defaults write com.apple.iphonesimulator EnableKeyboardSync -bool NO
 # Create the simulator we will use for the tests.
-xcrun simctl create "${SIMULATOR_NAME}" "iPhone 8" 2> /dev/null
+xcrun simctl create "${SIMULATOR_NAME}" "iPhone 13" "iOS15.5" 2> /dev/null
 # Find the UDID of the newly created simulator.
 SIMULATOR_UDID=`xcrun simctl list --json devices | jq -r ".devices | flatten | .[] | select(.name == \"${SIMULATOR_NAME}\").udid"`
 # Edit the simulator's .GlobalPreferences.plist to use the Korean language.

diff --git a/UITests/HostUITests/KoreanInputTests.swift b/UITests/HostUITests/KoreanInputTests.swift
@@ -95,37 +95,6 @@ final class KoreanInputTests: XCTestCase {
         XCTAssertEqual(app.textView?.value as? String, "\"어\"")
     }
 
-    func testInsertingKoreanCharactersBelowStringContainingKoreanLetters() throws {
-        let app = XCUIApplication().disablingTextPersistance()
-        app.launch()
-        app.textView?.tap()
-        app.keys["ㅇ"].tap()
-        app.keys["ㅓ"].tap()
-        app.keys["ㅇ"].tap()
-        app.keys["ㅓ"].tap()
-        app.keys["ㅇ"].tap()
-        app.keys["ㅓ"].tap()
-        app.buttons["Return"].tap()
-        app.keys["more"].tap()
-        app.keys["\""].tap()
-        app.keys["more"].tap()
-        app.keys["ㅇ"].tap()
-        app.keys["ㅓ"].tap()
-        app.keys["ㅇ"].tap()
-        app.keys["ㅓ"].tap()
-        app.keys["ㅇ"].tap()
-        app.keys["ㅓ"].tap()
-        app.tap(at: CGPoint(x: 100, y: 100))
-        app.buttons["Return"].tap()
-        app.keys["ㅇ"].tap()
-        app.keys["ㅓ"].tap()
-        app.keys["ㅇ"].tap()
-        app.keys["ㅓ"].tap()
-        app.keys["ㅇ"].tap()
-        app.keys["ㅓ"].tap()
-        XCTAssertEqual(app.textView?.value as? String, "어어어\n\"어어어\"\n어어어")
-    }
-
     func testInsertingKoreanCharactersInTextWithCRLFLineEndings() throws {
         let app = XCUIApplication().disablingTextPersistance().usingCRLFLineEndings()
         app.launch()

diff --git a/UITests/HostUITests/XCUIApplication+Helpers.swift b/UITests/HostUITests/XCUIApplication+Helpers.swift
@@ -10,13 +10,6 @@ extension XCUIApplication {
         scrollViews.children(matching: .textView).element
     }
 
-    func tap(at point: CGPoint) {
-        let normalized = coordinate(withNormalizedOffset: .zero)
-        let offset = CGVector(dx: point.x, dy: point.y)
-        let coordinate = normalized.withOffset(offset)
-        coordinate.tap()
-    }
-
     func disablingTextPersistance() -> Self {
         var newLaunchEnvironment = launchEnvironment
         newLaunchEnvironment[EnvironmentKey.disableTextPersistance] = "1"