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

This commit is contained in:
James Addison 2020-04-15 06:03:04 +01:00 committed by GitHub
parent ae5f866b37
commit c366e8790d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 1293 additions and 18 deletions

View File

@ -74,28 +74,29 @@ jobs:
parameters: parameters:
name: Browser_Tests_OSX_Safari_IOS_9 name: Browser_Tests_OSX_Safari_IOS_9
displayName: iOS Simulator Safari 9 displayName: iOS Simulator Safari 9
vmImage: 'macOS-10.13' vmImage: 'macOS-10.14'
targetBrowser: Safari_IOS_9 targetBrowser: Safari_IOS_9
- template: ci/browser-tests.yml - template: ci/browser-tests.yml
parameters: parameters:
name: Browser_Tests_OSX_Safari_IOS_10 name: Browser_Tests_OSX_Safari_IOS_10
displayName: iOS Simulator Safari 10 displayName: iOS Simulator Safari 10
vmImage: 'macOS-10.13' vmImage: 'macOS-10.14'
targetBrowser: Safari_IOS_10 targetBrowser: Safari_IOS_10
- template: ci/browser-tests.yml - template: ci/browser-tests.yml
parameters: parameters:
name: Browser_Tests_OSX_Safari_IOS_12 name: Browser_Tests_OSX_Safari_IOS_12
displayName: iOS Simulator Safari 12 displayName: iOS Simulator Safari 12
vmImage: 'macOS-10.13' vmImage: 'macOS-10.14'
targetBrowser: Safari_IOS_12 targetBrowser: Safari_IOS_12
xcodeSelection: '/Applications/Xcode_10.1.app'
- template: ci/browser-tests.yml - template: ci/browser-tests.yml
parameters: parameters:
name: Browser_Tests_OSX_Safari_Stable name: Browser_Tests_OSX_Safari_Stable
displayName: OSX Safari Stable displayName: OSX Safari Stable
vmImage: 'macOS-10.13' vmImage: 'macOS-10.14'
targetBrowser: Safari_Stable targetBrowser: Safari_Stable
- template: ci/browser-tests.yml - template: ci/browser-tests.yml

View File

@ -31,6 +31,9 @@ jobs:
inputs: inputs:
artifactName: build artifactName: build
downloadPath: $(System.DefaultWorkingDirectory) downloadPath: $(System.DefaultWorkingDirectory)
- ${{ if ne(parameters.xcodeSelection, '') }}:
- script: sudo xcode-select -s "${{ parameters.xcodeSelection }}"
displayName: 'Switch Xcode'
- ${{ if not(eq(parameters.xvfb, 'true')) }}: - ${{ if not(eq(parameters.xvfb, 'true')) }}:
- script: npm run karma - script: npm run karma
displayName: 'Run browser tests' displayName: 'Run browser tests'

View File

@ -4,6 +4,7 @@
const path = require('path'); const path = require('path');
const simctl = require('node-simctl'); const simctl = require('node-simctl');
const iosSimulator = require('appium-ios-simulator'); const iosSimulator = require('appium-ios-simulator');
const listenAddress = 'localhost';
const port = 9876; const port = 9876;
const log = require('karma/lib/logger').create('launcher:MobileSafari'); const log = require('karma/lib/logger').create('launcher:MobileSafari');
@ -13,16 +14,19 @@ module.exports = function(config) {
Safari_IOS_9: { Safari_IOS_9: {
base: 'MobileSafari', base: 'MobileSafari',
name: 'iPhone 5s', name: 'iPhone 5s',
platform: 'iOS',
sdk: '9.0' sdk: '9.0'
}, },
Safari_IOS_10: { Safari_IOS_10: {
base: 'MobileSafari', base: 'MobileSafari',
name: 'iPhone 5s', name: 'iPhone 5s',
platform: 'iOS',
sdk: '10.0' sdk: '10.0'
}, },
Safari_IOS_12: { Safari_IOS_12: {
base: 'MobileSafari', base: 'MobileSafari',
name: 'iPhone 5s', name: 'iPhone 5s',
platform: 'iOS',
sdk: '12.1' sdk: '12.1'
}, },
SauceLabs_IE9: { SauceLabs_IE9: {
@ -85,7 +89,7 @@ module.exports = function(config) {
flags: ['-extoff'] flags: ['-extoff']
}, },
Safari_Stable: { Safari_Stable: {
base: 'Safari' base: 'SafariNative'
}, },
Chrome_Stable: { Chrome_Stable: {
base: 'ChromeHeadless' base: 'ChromeHeadless'
@ -125,8 +129,8 @@ module.exports = function(config) {
} }
baseBrowserDecorator(this); baseBrowserDecorator(this);
this.on('start', url => { this.on('start', url => {
simctl.getDevices().then(devices => { simctl.getDevices(args.sdk, args.platform).then(devices => {
const d = devices[args.sdk].find(d => { const d = devices.find(d => {
return d.name === args.name; return d.name === args.name;
}); });
@ -208,6 +212,9 @@ module.exports = function(config) {
outputDir: 'tmp/junit/' outputDir: 'tmp/junit/'
}, },
// web server listen address,
listenAddress,
// web server port // web server port
port, port,

1282
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@ -64,10 +64,10 @@
"karma-ie-launcher": "^1.0.0", "karma-ie-launcher": "^1.0.0",
"karma-junit-reporter": "^1.2.0", "karma-junit-reporter": "^1.2.0",
"karma-mocha": "^1.3.0", "karma-mocha": "^1.3.0",
"karma-safari-launcher": "^1.0.0", "karma-safarinative-launcher": "^1.1.0",
"karma-sauce-launcher": "^2.0.2", "karma-sauce-launcher": "^2.0.2",
"mocha": "^6.1.4", "mocha": "^6.1.4",
"node-simctl": "^5.0.0", "node-simctl": "^5.3.0",
"platform": "1.3.4", "platform": "1.3.4",
"prettier": "1.17.0", "prettier": "1.17.0",
"replace-in-file": "^3.0.0", "replace-in-file": "^3.0.0",