Skip to content

Commit f867ea5

Browse files
authored
ci: update CI config (#1171)
* ci: update CI config * refer to env var * Fix logical OR operator in desired capabilities
1 parent b471a05 commit f867ea5

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

.github/workflows/functional-test.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@ jobs:
2121
- target: test/functional/ios/safari_tests.py
2222
name: func_test_ios1
2323

24-
runs-on: macos-14
24+
runs-on: macos-15
2525

2626
# Please make sure the available Xcode versions and iOS versions
2727
# on the runner images. https://github.com/actions/runner-images
2828
env:
29-
XCODE_VERSION: 15.3
30-
IOS_VERSION: 17.4
31-
IPHONE_MODEL: iPhone 15 Plus
29+
XCODE_VERSION: 16.4
30+
IOS_VERSION: 18.5
31+
IPHONE_MODEL: iPhone 16 Plus
3232

3333
steps:
3434
- uses: actions/checkout@v4
@@ -186,7 +186,7 @@ jobs:
186186
fail-fast: false
187187
matrix:
188188
include:
189-
- platform: macos-14
189+
- platform: macos-15
190190
e2e-tests: flutter-ios
191191
- platform: ubuntu-latest
192192
e2e-tests: flutter-android
@@ -197,9 +197,9 @@ jobs:
197197
API_LEVEL: 28
198198
ARCH: x86
199199
CI: true
200-
XCODE_VERSION: 15.4
201-
IOS_VERSION: 17.5
202-
IPHONE_MODEL: iPhone 15
200+
XCODE_VERSION: 16.4
201+
IOS_VERSION: 18.5
202+
IPHONE_MODEL: iPhone 16
203203
FLUTTER_ANDROID_APP: "https://github.com/AppiumTestDistribution/appium-flutter-server/releases/latest/download/app-debug.apk"
204204
FLUTTER_IOS_APP: "https://github.com/AppiumTestDistribution/appium-flutter-server/releases/latest/download/ios.zip"
205205

@@ -231,12 +231,12 @@ jobs:
231231
node-version: 'lts/*'
232232

233233
- name: Install Appium
234-
run: npm install --location=global appium
234+
run: npm install --location=global appium@2.19.0
235235

236236
- name: Install Android drivers and Run Appium
237237
if: matrix.e2e-tests == 'flutter-android'
238238
run: |
239-
appium driver install uiautomator2
239+
appium driver install uiautomator2@4.2.9
240240
appium driver install appium-flutter-integration-driver --source npm
241241
nohup appium --allow-insecure=adb_shell --relaxed-security --log-timestamp --log-no-colors 2>&1 > appium_flutter_android.log &
242242
@@ -279,7 +279,7 @@ jobs:
279279
- name: Install IOS drivers and Run Appium
280280
if: matrix.e2e-tests == 'flutter-ios'
281281
run: |
282-
appium driver install xcuitest
282+
appium driver install xcuitest@9.10.5
283283
appium driver install appium-flutter-integration-driver --source npm
284284
appium driver run xcuitest build-wda
285285
nohup appium --allow-insecure=adb_shell --relaxed-security --log-timestamp --log-no-colors 2>&1 > appium_ios.log &

test/functional/ios/helper/desired_capabilities.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ def get_desired_capabilities(app: Optional[str] = None) -> Dict[str, Any]:
2828
desired_caps: Dict[str, Any] = {
2929
'deviceName': iphone_device_name(),
3030
'platformName': 'iOS',
31-
'platformVersion': '17.4',
31+
'platformVersion': os.getenv('IOS_VERSION') or '17.4',
3232
'automationName': 'XCUITest',
3333
'allowTouchIdEnroll': True,
3434
'wdaLocalPort': wda_port(),
@@ -75,7 +75,7 @@ def wda_port() -> int:
7575

7676

7777
def iphone_device_name() -> str:
78-
prefix = 'iPhone 15 Plus'
78+
prefix = os.getenv('IPHONE_MODEL') or 'iPhone 15 Plus'
7979
if PytestXdistWorker.NUMBER == PytestXdistWorker.gw(0):
8080
return f'{prefix} - 8100'
8181
elif PytestXdistWorker.NUMBER == PytestXdistWorker.gw(1):

0 commit comments

Comments
 (0)