Skip to content

Commit 911b508

Browse files
committed
Merge branch 'appium-master'
update
2 parents 7e3eca8 + b011bb3 commit 911b508

File tree

110 files changed

+2326
-2314
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

110 files changed

+2326
-2314
lines changed

.github/workflows/functional-test.yml

Lines changed: 30 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,35 +2,52 @@ name: Functional Tests
22

33
on: [pull_request]
44

5+
concurrency:
6+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
7+
cancel-in-progress: true
58

69
jobs:
710
test:
8-
env:
9-
CI: true
10-
_FORCE_LOGS: 1
11-
XCODE_VERSION: 13.4
12-
DEVICE_NAME: iPhone 11
13-
PLATFORM_VERSION: 15.5
14-
# https://github.com/actions/runner-images/blob/main/images/macos/macos-12-Readme.md
15-
runs-on: macos-12
11+
strategy:
12+
fail-fast: false
13+
matrix:
14+
test_targets:
15+
- XCODE_VERSION: 15.3
16+
IOS_VERSION: 17.4
17+
IOS_MODEL: iPhone 15 Plus
18+
- XCODE_VERSION: 14.3.1
19+
IOS_VERSION: 16.4
20+
IOS_MODEL: iPhone 14 Plus
21+
22+
# https://github.com/actions/runner-images/blob/main/images/macos/macos-14-Readme.md
23+
runs-on: macos-14
1624
steps:
1725
- uses: actions/checkout@v3
1826
- uses: actions/setup-node@v3
1927
with:
2028
node-version: lts/*
2129
- uses: maxim-lobanov/setup-xcode@v1
2230
with:
23-
xcode-version: "${{ env.XCODE_VERSION }}"
31+
xcode-version: ${{matrix.test_targets.XCODE_VERSION}}
2432
- run: |
2533
npm install
2634
mkdir -p ./Resources/WebDriverAgent.bundle
2735
name: Install dev dependencies
2836
29-
- run: |
30-
target_sim_id=$(xcrun simctl list devices available | grep "$DEVICE_NAME (" | cut -d "(" -f2 | cut -d ")" -f1)
31-
open -Fn "$(xcode-select -p)/Applications/Simulator.app"
32-
xcrun simctl bootstatus $target_sim_id -b
37+
- uses: futureware-tech/simulator-action@v3
38+
with:
39+
model: ${{matrix.test_targets.IOS_MODEL}}
40+
os: iOS
41+
os_version: ${{matrix.test_targets.IOS_VERSION}}
42+
erase_before_boot: true
43+
# to prevent unexpected shutdown failure error
44+
shutdown_after_job: false
3345
name: Preboot Simulator
3446

3547
- run: npm run e2e-test
3648
name: Run functional tests
49+
env:
50+
CI: true
51+
_FORCE_LOGS: 1
52+
DEVICE_NAME: ${{matrix.test_targets.IOS_MODEL}}
53+
PLATFORM_VERSION: ${{matrix.test_targets.IOS_VERSION}}

.github/workflows/pr-title.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ jobs:
88
name: https://www.conventionalcommits.org
99
runs-on: ubuntu-latest
1010
steps:
11-
- uses: beemojs/conventional-pr-action@v2
11+
- uses: beemojs/conventional-pr-action@v3
1212
with:
1313
config-preset: angular
1414
env:

.github/workflows/publish.js.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ on:
1010

1111
jobs:
1212
build:
13-
runs-on: macos-13
13+
runs-on: macos-14
1414

1515
env:
16-
XCODE_VERSION: 14.3.1
16+
XCODE_VERSION: 15.3
1717
ZIP_PKG_NAME_IOS: "WebDriverAgentRunner-Runner.zip"
1818
PKG_PATH_IOS: "appium_wda_ios"
1919
ZIP_PKG_NAME_TVOS: "WebDriverAgentRunner_tvOS-Runner.zip"

.github/workflows/unit-test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ jobs:
77
prepare_matrix:
88
runs-on: ubuntu-latest
99
outputs:
10-
versions: ${{ steps.generate-matrix.outputs.versions }}
10+
versions: ${{ steps.generate-matrix.outputs.active }}
1111
steps:
12-
- name: Select 3 most recent LTS versions of Node.js
12+
- name: Select all active LTS versions of Node.js
1313
id: generate-matrix
14-
run: echo "versions=$(curl -s https://endoflife.date/api/nodejs.json | jq -c '[[.[] | select(.lts != false)][:3] | .[].cycle | tonumber]')" >> "$GITHUB_OUTPUT"
14+
uses: msimerson/node-lts-versions@v1
1515

1616
test:
1717
needs:

.github/workflows/wda-package.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ on:
88
- completed
99

1010
env:
11-
HOST: macos-13
12-
XCODE_VERSION: 14.3.1
13-
DESTINATION_SIM: platform=iOS Simulator,name=iPhone 14 Pro
14-
DESTINATION_SIM_tvOS: platform=tvOS Simulator,name=Apple TV
11+
HOST: macos-14
12+
XCODE_VERSION: 15.3
13+
DESTINATION_SIM: platform=iOS Simulator,name=iPhone 15 Pro
14+
DESTINATION_SIM_tvOS: platform=tvOS Simulator,name=Apple TV 4K (3rd generation)
1515

1616
jobs:
1717
host_machine:

0 commit comments

Comments
 (0)