Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Azure Pipelines: upgrade from macOS 10.13 -> 10.14 #2204

Merged
merged 15 commits into from
Apr 15, 2020
Merged

Azure Pipelines: upgrade from macOS 10.13 -> 10.14 #2204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
40d3689
Azure Pipelines: upgrade from macOS 10.13 -> 10.14
jayaddison Apr 13, 2020
551e1d0
Revert "debug"
jayaddison Apr 14, 2020
5fe98ec
Update node-simctl to v5.3.0
jayaddison Apr 14, 2020
98c1433
Filter devices by SDK version
jayaddison Apr 14, 2020
b8a7ece
Match node-simctl getDevices sdk-filtered return type
jayaddison Apr 14, 2020
409e24c
Add platform filtering for iOS devices
jayaddison Apr 14, 2020
76c0e37
Use localhost listen address for karma server
jayaddison Apr 14, 2020
85b6240
iPhone 5s on iOS: partially revert 522a4430559f9cdb8b5d5a3ee6db32beaa…
jayaddison Apr 14, 2020
b54e0ec
Revert "iPhone 5s on iOS: partially revert 522a4430559f9cdb8b5d5a3ee6…
jayaddison Apr 14, 2020
33026a6
Use Xcode 10.1 for iOS Simulator Safari 12
jayaddison Apr 14, 2020
e4cd355
Relocate YML key
jayaddison Apr 14, 2020
d0e5fbd
Add missing YML colon
jayaddison Apr 14, 2020
f75c0c5
Run xcode-select as super-user
jayaddison Apr 14, 2020
8bf0438
Experiment: migrate to muthu90ec/karma-safarinative-launcher
jayaddison Apr 14, 2020
4297abe
Revert "Revert "debug""
jayaddison Apr 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions azure-pipelines.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,28 +74,29 @@ jobs:
parameters:
name: Browser_Tests_OSX_Safari_IOS_9
displayName: iOS Simulator Safari 9
vmImage: 'macOS-10.13'
vmImage: 'macOS-10.14'
targetBrowser: Safari_IOS_9

- template: ci/browser-tests.yml
parameters:
name: Browser_Tests_OSX_Safari_IOS_10
displayName: iOS Simulator Safari 10
vmImage: 'macOS-10.13'
vmImage: 'macOS-10.14'
targetBrowser: Safari_IOS_10

- template: ci/browser-tests.yml
parameters:
name: Browser_Tests_OSX_Safari_IOS_12
displayName: iOS Simulator Safari 12
vmImage: 'macOS-10.13'
vmImage: 'macOS-10.14'
targetBrowser: Safari_IOS_12
xcodeSelection: '/Applications/Xcode_10.1.app'

- template: ci/browser-tests.yml
parameters:
name: Browser_Tests_OSX_Safari_Stable
displayName: OSX Safari Stable
vmImage: 'macOS-10.13'
vmImage: 'macOS-10.14'
targetBrowser: Safari_Stable

- template: ci/browser-tests.yml
Expand Down
3 changes: 3 additions & 0 deletions ci/browser-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@ jobs:
inputs:
artifactName: build
downloadPath: $(System.DefaultWorkingDirectory)
- ${{ if ne(parameters.xcodeSelection, '') }}:
- script: sudo xcode-select -s "${{ parameters.xcodeSelection }}"
displayName: 'Switch Xcode'
- ${{ if not(eq(parameters.xvfb, 'true')) }}:
- script: npm run karma
displayName: 'Run browser tests'
Expand Down
13 changes: 10 additions & 3 deletions karma.conf.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
const path = require('path');
const simctl = require('node-simctl');
const iosSimulator = require('appium-ios-simulator');
const listenAddress = 'localhost';
const port = 9876;

const log = require('karma/lib/logger').create('launcher:MobileSafari');
Expand All @@ -13,16 +14,19 @@ module.exports = function(config) {
Safari_IOS_9: {
base: 'MobileSafari',
name: 'iPhone 5s',
platform: 'iOS',
sdk: '9.0'
},
Safari_IOS_10: {
base: 'MobileSafari',
name: 'iPhone 5s',
platform: 'iOS',
sdk: '10.0'
},
Safari_IOS_12: {
base: 'MobileSafari',
name: 'iPhone 5s',
platform: 'iOS',
sdk: '12.1'
},
SauceLabs_IE9: {
Expand Down Expand Up @@ -85,7 +89,7 @@ module.exports = function(config) {
flags: ['-extoff']
},
Safari_Stable: {
base: 'Safari'
base: 'SafariNative'
},
Chrome_Stable: {
base: 'Chrome'
Expand Down Expand Up @@ -125,8 +129,8 @@ module.exports = function(config) {
}
baseBrowserDecorator(this);
this.on('start', url => {
simctl.getDevices().then(devices => {
const d = devices[args.sdk].find(d => {
simctl.getDevices(args.sdk, args.platform).then(devices => {
const d = devices.find(d => {
return d.name === args.name;
});

Expand Down Expand Up @@ -208,6 +212,9 @@ module.exports = function(config) {
outputDir: 'tmp/junit/'
},

// web server listen address,
listenAddress,

// web server port
port,

Expand Down
Loading