Merge pull request #282 from AirtestProject/dev

Dev

Author: yimelia

.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-13
+  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:

.eslintignore

@@ -2,35 +2,60 @@ 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:
+          - HOST_OS: 'macos-15'
+            XCODE_VERSION: '26.0'
+            IOS_VERSION: '26.0'
+            IOS_MODEL: iPhone 17
+          - HOST_OS: 'macos-15'
+            XCODE_VERSION: '16.4'
+            IOS_VERSION: '18.4'
+            IOS_MODEL: iPhone 16 Plus
+          - HOST_OS: 'macos-14'
+            XCODE_VERSION: '15.4'
+            IOS_VERSION: '17.5'
+            IOS_MODEL: iPhone 15 Plus
+
+    # https://github.com/actions/runner-images/blob/main/images/macos/macos-14-Readme.md
+    runs-on: ${{matrix.test_targets.HOST_OS}}
     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}}

.eslintrc.json

@@ -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:

.github/workflows/functional-test.yml

@@ -8,16 +8,21 @@ on:
   push:
     branches: [ master ]
 
+permissions:
+  contents: write
+  pull-requests: write
+  issues: write
+  id-token: write # to enable use of OIDC for trusted publishing and npm provenance
+
 jobs:
   build:
-    runs-on: macos-13
+    runs-on: macos-15
 
     env:
-      XCODE_VERSION: 14.3.1
-      ZIP_PKG_NAME_IOS: "WebDriverAgentRunner-Runner.zip"
-      PKG_PATH_IOS: "appium_wda_ios"
-      ZIP_PKG_NAME_TVOS: "WebDriverAgentRunner_tvOS-Runner.zip"
-      PKG_PATH_TVOS: "appium_wda_tvos"
+      XCODE_VERSION: 16.3
+      # Available destination for simulators depend on Xcode version.
+      DESTINATION_SIM: platform=iOS Simulator,name=iPhone 16 Plus
+      DESTINATION_SIM_TVOS: platform=tvOS Simulator,name=Apple TV 4K (3rd generation)
 
     steps:
     - uses: actions/checkout@v2
@@ -36,41 +41,62 @@ jobs:
       name: Run test
 
     # building WDA packages
-    - name: Build iOS
-      run: |
-        xcodebuild clean build-for-testing \
-          -project WebDriverAgent.xcodeproj \
-          -derivedDataPath $PKG_PATH_IOS \
-          -scheme WebDriverAgentRunner \
-          -destination generic/platform=iOS \
-          CODE_SIGNING_ALLOWED=NO ARCHS=arm64
-    - name: Creating a zip of WebDriverAgentRunner-Runner.app for iOS after removing test frameworks
-      run: |
-        pushd appium_wda_ios/Build/Products/Debug-iphoneos
-        rm -rf WebDriverAgentRunner-Runner.app/Frameworks/XC*.framework
-        zip -r $ZIP_PKG_NAME_IOS WebDriverAgentRunner-Runner.app
-        popd
-        mv $PKG_PATH_IOS/Build/Products/Debug-iphoneos/$ZIP_PKG_NAME_IOS ./
-    - name: Build tvOS
-      run: |
-        xcodebuild clean build-for-testing \
-          -project WebDriverAgent.xcodeproj \
-          -derivedDataPath $PKG_PATH_TVOS \
-          -scheme WebDriverAgentRunner_tvOS \
-          -destination generic/platform=tvOS \
-          CODE_SIGNING_ALLOWED=NO ARCHS=arm64
-    - name: Creating a zip of WebDriverAgentRunner-Runner.app for tvOS after removing test frameworks
-      run: |
-        pushd appium_wda_tvos/Build/Products/Debug-appletvos
-        rm -rf WebDriverAgentRunner_tvOS-Runner.app/Frameworks/XC*.framework
-        zip -r $ZIP_PKG_NAME_TVOS WebDriverAgentRunner_tvOS-Runner.app
-        popd
-        mv $PKG_PATH_TVOS/Build/Products/Debug-appletvos/$ZIP_PKG_NAME_TVOS ./
+    - name: Building iOS
+      run: sh $GITHUB_WORKSPACE/Scripts/ci/build-real.sh
+      env:
+        DERIVED_DATA_PATH: appium_wda_ios
+        SCHEME: WebDriverAgentRunner
+        DESTINATION: generic/platform=iOS
+        WD: appium_wda_ios/Build/Products/Debug-iphoneos
+        ZIP_PKG_NAME: WebDriverAgentRunner-Runner.zip
+    - name: Building tvOS
+      run: sh $GITHUB_WORKSPACE/Scripts/ci/build-real.sh
+      env:
+        DERIVED_DATA_PATH: appium_wda_tvos
+        SCHEME: WebDriverAgentRunner_tvOS
+        DESTINATION: generic/platform=tvOS
+        WD: appium_wda_tvos/Build/Products/Debug-appletvos
+        ZIP_PKG_NAME: WebDriverAgentRunner_tvOS-Runner.zip
+    - name: Building iOS sim arm64
+      run: sh $GITHUB_WORKSPACE/Scripts/ci/build-sim.sh
+      env:
+        DERIVED_DATA_PATH: appium_wda_ios_sim_arm64
+        SCHEME: WebDriverAgentRunner
+        DESTINATION: ${{ env.DESTINATION_SIM }}
+        WD: appium_wda_ios_sim_arm64/Build/Products/Debug-iphonesimulator
+        ZIP_PKG_NAME: WebDriverAgentRunner-Build-Sim-arm64.zip
+        ARCHS: arm64
+    - name: Building iOS sim x86_64
+      run: sh $GITHUB_WORKSPACE/Scripts/ci/build-sim.sh
+      env:
+        DERIVED_DATA_PATH: appium_wda_ios_sim_x86_64
+        SCHEME: WebDriverAgentRunner
+        DESTINATION: ${{ env.DESTINATION_SIM }}
+        WD: appium_wda_ios_sim_x86_64/Build/Products/Debug-iphonesimulator
+        ZIP_PKG_NAME: WebDriverAgentRunner-Build-Sim-x86_64.zip
+        ARCHS: x86_64
+    - name: Building tvOS sim arm64
+      run: sh $GITHUB_WORKSPACE/Scripts/ci/build-sim.sh
+      env:
+        DERIVED_DATA_PATH: appium_wda_tvos_sim_arm64
+        SCHEME: WebDriverAgentRunner_tvOS
+        DESTINATION: ${{ env.DESTINATION_SIM_TVOS }}
+        WD: appium_wda_tvos_sim_arm64/Build/Products/Debug-appletvsimulator
+        ZIP_PKG_NAME: WebDriverAgentRunner_tvOS-Build-Sim-arm64.zip
+        ARCHS: arm64
+    - name: Building tvOS sim x86_64
+      run: sh $GITHUB_WORKSPACE/Scripts/ci/build-sim.sh
+      env:
+        DERIVED_DATA_PATH: appium_wda_tvos_sim_x86_64
+        SCHEME: WebDriverAgentRunner_tvOS
+        DESTINATION: ${{ env.DESTINATION_SIM_TVOS }}
+        WD: appium_wda_tvos_sim_x86_64/Build/Products/Debug-appletvsimulator
+        ZIP_PKG_NAME: WebDriverAgentRunner_tvOS-Build-Sim-x86_64.zip
+        ARCHS: x86_64
 
     # release tasks
     - run: npx semantic-release
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-        NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
       name: Release
 

.github/workflows/pr-title.yml

@@ -7,11 +7,11 @@ jobs:
   prepare_matrix:
     runs-on: ubuntu-latest
     outputs:
-      versions: ${{ steps.generate-matrix.outputs.versions }}
+      versions: ${{ steps.generate-matrix.outputs.lts }}
     steps:
-    - name: Select 3 most recent LTS versions of Node.js
+    - name: Select all current 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:

.github/workflows/publish.js.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-15
+  XCODE_VERSION: 16.3
+  DESTINATION_SIM: platform=iOS Simulator,name=iPhone 16 Plus
+  DESTINATION_SIM_tvOS: platform=tvOS Simulator,name=Apple TV 4K (3rd generation)
 
 jobs:
   host_machine:
@@ -29,12 +29,14 @@ jobs:
     runs-on: ${{ needs.host_machine.outputs.host }}
 
     env:
+      PKG_NAME_IOS: "WebDriverAgentRunner-Runner"
       ZIP_PKG_NAME_IOS: "WebDriverAgentRunner-Runner.zip"
+      PKG_NAME_TVOS: "WebDriverAgentRunner_tvOS-Runner"
       ZIP_PKG_NAME_TVOS: "WebDriverAgentRunner_tvOS-Runner.zip"
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - uses: maxim-lobanov/setup-xcode@v1
         with:
           xcode-version: "${{ env.XCODE_VERSION }}"
@@ -57,12 +59,14 @@ jobs:
           ZIP_PKG_NAME: "${{ env.ZIP_PKG_NAME_TVOS }}"
 
       - name: Upload the built generic app package for iOS
-        uses: actions/upload-artifact@v3.1.0
+        uses: actions/upload-artifact@master
         with:
+          name: "${{ env.PKG_NAME_IOS }}"
           path: "${{ env.ZIP_PKG_NAME_IOS }}"
       - name: Upload the built generic app package for tvOS
-        uses: actions/upload-artifact@v3.1.0
+        uses: actions/upload-artifact@master
         with:
+          name: "${{ env.PKG_NAME_TVOS }}"
           path: "${{ env.ZIP_PKG_NAME_TVOS }}"
 
   for_simulator_devices:
@@ -72,9 +76,19 @@ jobs:
 
     strategy:
       matrix:
-        # '' is for iOS
-        target: ['', '_tvOS']
-        arch: [x86_64, arm64]
+        include:
+          - target: ''
+            arch: x86_64
+            simulator_name: Debug-iphonesimulator
+          - target: ''
+            arch: arm64
+            simulator_name: Debug-iphonesimulator
+          - target: '_tvOS'
+            arch: x86_64
+            simulator_name: Debug-appletvsimulator
+          - target: '_tvOS'
+            arch: arm64
+            simulator_name: Debug-appletvsimulator
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -85,11 +99,13 @@ jobs:
         run: |
           DESTINATION=$DESTINATION_SIM${{ matrix.target }} sh $GITHUB_WORKSPACE/Scripts/ci/build-sim.sh
         env:
-          TARGET: ${{ matrix.target }}
           SCHEME: WebDriverAgentRunner${{ matrix.target }}
           ARCHS: ${{ matrix.arch }}
           ZIP_PKG_NAME: "WebDriverAgentRunner${{ matrix.target }}-Build-Sim-${{ matrix.arch }}.zip"
+          DERIVED_DATA_PATH: wda_build
+          WD: wda_build/Build/Products/${{ matrix.simulator_name }}
       - name: Upload the built generic app package for WebDriverAgentRunner${{ matrix.target }} with ${{ matrix.arch }}
-        uses: actions/upload-artifact@v3.1.0
+        uses: actions/upload-artifact@master
         with:
+          name: "WebDriverAgentRunner${{ matrix.target }}-Build-Sim-${{ matrix.arch }}"
           path: "WebDriverAgentRunner${{ matrix.target }}-Build-Sim-${{ matrix.arch }}.zip"

.github/workflows/unit-test.yml

@@ -35,7 +35,11 @@
     ["@semantic-release/github", {
       "assets": [
         "WebDriverAgentRunner-Runner.zip",
-        "WebDriverAgentRunner_tvOS-Runner.zip"
+        "WebDriverAgentRunner_tvOS-Runner.zip",
+        "WebDriverAgentRunner-Build-Sim-arm64.zip",
+        "WebDriverAgentRunner-Build-Sim-x86_64.zip",
+        "WebDriverAgentRunner_tvOS-Build-Sim-arm64.zip",
+        "WebDriverAgentRunner_tvOS-Build-Sim-x86_64.zip"
     ]}]
   ]
 }