Merge branch 'appium:master' into main

SonicCloudOrg · Nov 5, 2024 · 3d192e6 · 3d192e6
2 parents 6126161 + afd09a8
commit 3d192e6
Show file tree

Hide file tree

Showing 91 changed files with 2,031 additions and 1,742 deletions.
diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml
@@ -1,19 +1,19 @@
 # https://docs.microsoft.com/en-us/azure/devops/pipelines/agents/hosted?view=azure-devops&tabs=yaml
 variables:
-  MIN_VM_IMAGE: macOS-12
-  MIN_XCODE_VERSION: 13.1
-  MIN_PLATFORM_VERSION: 15.0
-  MIN_TV_PLATFORM_VERSION: 15.0
-  MIN_TV_DEVICE_NAME: Apple TV 4K (2nd generation)
-  MIN_IPHONE_DEVICE_NAME: iPhone 11
-  MIN_IPAD_DEVICE_NAME: iPad Pro (11-inch) (3rd generation)
-  MAX_VM_IMAGE: macOS-12
-  MAX_XCODE_VERSION: 14.2
-  MAX_PLATFORM_VERSION: 16.2
-  MAX_PLATFORM_VERSION_TV: 16.1
-  MAX_IPHONE_DEVICE_NAME: iPhone 13
-  MAX_TV_DEVICE_NAME: Apple TV 4K (2nd generation)
-  MAX_IPAD_DEVICE_NAME: iPad Pro (11-inch) (3rd generation)
+  MIN_VM_IMAGE: macOS-14
+  MIN_XCODE_VERSION: 14.3.1
+  MIN_PLATFORM_VERSION: 16.4
+  MIN_TV_PLATFORM_VERSION: 16.4
+  MIN_TV_DEVICE_NAME: Apple TV 4K (3rd generation)
+  MIN_IPHONE_DEVICE_NAME: iPhone 14 Plus
+  MIN_IPAD_DEVICE_NAME: iPad Pro (11-inch) (4th generation)
+  MAX_VM_IMAGE: macOS-14
+  MAX_XCODE_VERSION: 15.4
+  MAX_PLATFORM_VERSION: 17.5
+  MAX_PLATFORM_VERSION_TV: 17.5
+  MAX_IPHONE_DEVICE_NAME: iPhone 15 Plus
+  MAX_TV_DEVICE_NAME: Apple TV 4K (3rd generation)
+  MAX_IPAD_DEVICE_NAME: iPad Air 11-inch (M2)
   DEFAULT_NODE_VERSION: "18.x"
 
 trigger:

diff --git a/.github/workflows/functional-test.yml b/.github/workflows/functional-test.yml
@@ -2,35 +2,57 @@ name: Functional Tests
 
 on: [pull_request]
 
+concurrency:
+  group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
+  cancel-in-progress: true
 
 jobs:
   test:
-    env:
-      CI: true
-      _FORCE_LOGS: 1
-      XCODE_VERSION: 13.4
-      DEVICE_NAME: iPhone 11
-      PLATFORM_VERSION: 15.5
-    # https://github.com/actions/runner-images/blob/main/images/macos/macos-12-Readme.md
-    runs-on: macos-12
+    strategy:
+      fail-fast: false
+      matrix:
+        test_targets:
+          - XCODE_VERSION: '16.0.0'
+            IOS_VERSION: '18.0'
+            IOS_MODEL: iPhone 15 Plus
+          - XCODE_VERSION: '15.3'
+            IOS_VERSION: '17.4'
+            IOS_MODEL: iPhone 15 Plus
+          - XCODE_VERSION: 14.3.1
+            IOS_VERSION: '16.4'
+            IOS_MODEL: iPhone 14 Plus
+
+    # https://github.com/actions/runner-images/blob/main/images/macos/macos-14-Readme.md
+    runs-on: macos-14
     steps:
     - uses: actions/checkout@v3
     - uses: actions/setup-node@v3
       with:
         node-version: lts/*
     - uses: maxim-lobanov/setup-xcode@v1
       with:
-        xcode-version: "${{ env.XCODE_VERSION }}"
+        xcode-version: ${{matrix.test_targets.XCODE_VERSION}}
     - run: |
         npm install
         mkdir -p ./Resources/WebDriverAgent.bundle
       name: Install dev dependencies
 
-    - run: |
-        target_sim_id=$(xcrun simctl list devices available | grep "$DEVICE_NAME (" | cut -d "(" -f2 | cut -d ")" -f1)
+    - name: Prepare iOS simulator
+      env:
+        DEVICE_NAME: ${{matrix.test_targets.IOS_MODEL}}
+        PLATFORM_VERSION: ${{matrix.test_targets.IOS_VERSION}}
+      run: |
         open -Fn "$(xcode-select -p)/Applications/Simulator.app"
-        xcrun simctl bootstatus $target_sim_id -b
-      name: Preboot Simulator
+        udid=$(xcrun simctl list devices available -j | \
+          node -p "Object.entries(JSON.parse(fs.readFileSync(0)).devices).filter((x) => x[0].includes('$PLATFORM_VERSION'.replace('.', '-'))).reduce((acc, x) => [...acc, ...x[1]], []).find(({name}) => name === '$DEVICE_NAME').udid")
+        xcrun simctl bootstatus $udid -b
+        xcrun simctl shutdown $udid
 
     - run: npm run e2e-test
       name: Run functional tests
+      env:
+        CI: true
+        _FORCE_LOGS: 1
+        _LOG_TIMESTAMP: 1
+        DEVICE_NAME: ${{matrix.test_targets.IOS_MODEL}}
+        PLATFORM_VERSION: ${{matrix.test_targets.IOS_VERSION}}
diff --git a/.github/workflows/pr-title.yml b/.github/workflows/pr-title.yml
@@ -8,7 +8,7 @@ jobs:
     name: https://www.conventionalcommits.org
     runs-on: ubuntu-latest
     steps:
-      - uses: beemojs/conventional-pr-action@v2
+      - uses: beemojs/conventional-pr-action@v3
         with:
           config-preset: angular
         env:

diff --git a/.github/workflows/publish.js.yml b/.github/workflows/publish.js.yml
@@ -10,10 +10,10 @@ on:
 
 jobs:
   build:
-    runs-on: macos-13
+    runs-on: macos-14
 
     env:
-      XCODE_VERSION: 14.3.1
+      XCODE_VERSION: 15.3
       ZIP_PKG_NAME_IOS: "WebDriverAgentRunner-Runner.zip"
       PKG_PATH_IOS: "appium_wda_ios"
       ZIP_PKG_NAME_TVOS: "WebDriverAgentRunner_tvOS-Runner.zip"

diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml
@@ -7,11 +7,11 @@ jobs:
   prepare_matrix:
     runs-on: ubuntu-latest
     outputs:
-      versions: ${{ steps.generate-matrix.outputs.versions }}
+      versions: ${{ steps.generate-matrix.outputs.active }}
     steps:
-    - name: Select 3 most recent LTS versions of Node.js
+    - name: Select all active LTS versions of Node.js
       id: generate-matrix
-      run: echo "versions=$(curl -s https://endoflife.date/api/nodejs.json | jq -c '[[.[] | select(.lts != false)][:3] | .[].cycle | tonumber]')" >> "$GITHUB_OUTPUT"
+      uses: msimerson/node-lts-versions@v1
 
   test:
     needs:

diff --git a/.github/workflows/wda-package.yml b/.github/workflows/wda-package.yml
@@ -8,10 +8,10 @@ on:
       - completed
 
 env:
-  HOST: macos-13
-  XCODE_VERSION: 14.3.1
-  DESTINATION_SIM: platform=iOS Simulator,name=iPhone 14 Pro
-  DESTINATION_SIM_tvOS: platform=tvOS Simulator,name=Apple TV
+  HOST: macos-14
+  XCODE_VERSION: 15.3
+  DESTINATION_SIM: platform=iOS Simulator,name=iPhone 15 Pro
+  DESTINATION_SIM_tvOS: platform=tvOS Simulator,name=Apple TV 4K (3rd generation)
 
 jobs:
   host_machine: