Skip to content

Commit 5f3fba4

Browse files
alan-agius4mhevery
alan-agius4
authored and
mhevery
committed
ci: update tested browsers to match supported browsers (angular#36973)
With a previous change we add FireFox Extended Support Release (ESR) to the list of supported browsers. With this change we now add this above mentioned browser to list of tested browsers and also update several other browsers. Removed browsers because they are no longer supported: - iOS 10 and 11 - Safari 10 and 11 Added - Firefox 68 (Current ESR version) - Safari 12 and 13 - iOS Safari 12 and 13 Updated - Update Chrome to 81 - Updated Firefox to 76 PR Close angular#36973
1 parent eca2246 commit 5f3fba4

File tree

1 file changed

+41
-60
lines changed

1 file changed

+41
-60
lines changed

‎browser-providers.conf.js‎

Lines changed: 41 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
var CIconfiguration = {
1515
'Chrome': {unitTest: {target: 'SL', required: true}, e2e: {target: null, required: true}},
1616
'Firefox': {unitTest: {target: 'SL', required: true}, e2e: {target: null, required: true}},
17+
'FirefoxESR': {unitTest: {target: 'SL', required: true}, e2e: {target: null, required: true}},
1718
// Disabled because using the "beta" channel of Chrome can cause non-deterministic CI results.
1819
// e.g. a new chrome beta version has been released, but the Saucelabs selenium server does
1920
// not provide a chromedriver version that is compatible with the new beta.
@@ -31,34 +32,45 @@ var CIconfiguration = {
3132
'Android8': {unitTest: {target: 'SL', required: true}, e2e: {target: null, required: true}},
3233
'Android9': {unitTest: {target: 'SL', required: true}, e2e: {target: null, required: true}},
3334
'Android10': {unitTest: {target: 'SL', required: true}, e2e: {target: null, required: true}},
34-
'Safari12': {unitTest: {target: 'SL', required: false}, e2e: {target: null, required: true}},
35-
'Safari13': {unitTest: {target: 'SL', required: false}, e2e: {target: null, required: true}},
36-
'iOS10': {unitTest: {target: 'SL', required: false}, e2e: {target: null, required: true}},
37-
'iOS11': {unitTest: {target: 'SL', required: false}, e2e: {target: null, required: true}},
35+
'Safari12': {unitTest: {target: 'SL', required: true}, e2e: {target: null, required: true}},
36+
'Safari13': {unitTest: {target: 'SL', required: true}, e2e: {target: null, required: true}},
37+
'iOS12': {unitTest: {target: 'SL', required: true}, e2e: {target: null, required: true}},
38+
'iOS13': {unitTest: {target: 'SL', required: true}, e2e: {target: null, required: true}},
3839
'WindowsPhone': {unitTest: {target: 'BS', required: false}, e2e: {target: null, required: true}}
3940
};
4041

4142
var customLaunchers = {
4243
'DartiumWithWebPlatform':
4344
{base: 'Dartium', flags: ['--enable-experimental-web-platform-features']},
4445
'ChromeNoSandbox': {base: 'Chrome', flags: ['--no-sandbox']},
45-
'SL_CHROME': {base: 'SauceLabs', browserName: 'chrome', version: '73'},
46+
'SL_CHROME': {base: 'SauceLabs', browserName: 'chrome', version: '81'},
4647
'SL_CHROMEBETA': {base: 'SauceLabs', browserName: 'chrome', version: 'beta'},
4748
'SL_CHROMEDEV': {base: 'SauceLabs', browserName: 'chrome', version: 'dev'},
48-
'SL_FIREFOX': {base: 'SauceLabs', browserName: 'firefox', version: '65'},
49+
'SL_FIREFOX': {base: 'SauceLabs', browserName: 'firefox', version: '76'},
50+
// Firefox 68 is the current ESR vesion
51+
'SL_FIREFOXESR': {base: 'SauceLabs', browserName: 'firefox', version: '68'},
4952
'SL_FIREFOXBETA':
5053
{base: 'SauceLabs', platform: 'Windows 10', browserName: 'firefox', version: 'beta'},
5154
'SL_FIREFOXDEV':
5255
{base: 'SauceLabs', platform: 'Windows 10', browserName: 'firefox', version: 'dev'},
53-
'SL_SAFARI7': {base: 'SauceLabs', browserName: 'safari', platform: 'OS X 10.9', version: '7.0'},
54-
'SL_SAFARI8': {base: 'SauceLabs', browserName: 'safari', platform: 'OS X 10.10', version: '8.0'},
55-
'SL_SAFARI9': {base: 'SauceLabs', browserName: 'safari', platform: 'OS X 10.11', version: '9.0'},
56-
'SL_SAFARI10':
57-
{base: 'SauceLabs', browserName: 'safari', platform: 'OS X 10.12', version: '10.0'},
58-
'SL_IOS7': {base: 'SauceLabs', browserName: 'iphone', platform: 'OS X 10.10', version: '7.1'},
59-
'SL_IOS8': {base: 'SauceLabs', browserName: 'iphone', platform: 'OS X 10.10', version: '8.4'},
60-
'SL_IOS9': {base: 'SauceLabs', browserName: 'iphone', platform: 'OS X 10.10', version: '9.3'},
61-
'SL_IOS10': {base: 'SauceLabs', browserName: 'iphone', platform: 'OS X 10.10', version: '10.0'},
56+
'SL_SAFARI12':
57+
{base: 'SauceLabs', browserName: 'safari', platform: 'macOS 10.13', version: '12.1'},
58+
'SL_SAFARI13':
59+
{base: 'SauceLabs', browserName: 'safari', platform: 'macOS 10.15', version: '13.0'},
60+
'SL_IOS12': {
61+
base: 'SauceLabs',
62+
browserName: 'Safari',
63+
platform: 'iOS',
64+
version: '12.0',
65+
device: 'iPhone 7 Simulator'
66+
},
67+
'SL_IOS13': {
68+
base: 'SauceLabs',
69+
browserName: 'Safari',
70+
platform: 'iOS',
71+
version: '13.0',
72+
device: 'iPhone 11 Simulator'
73+
},
6274
'SL_IE9':
6375
{base: 'SauceLabs', browserName: 'internet explorer', platform: 'Windows 2008', version: '9'},
6476
'SL_IE10': {
@@ -75,18 +87,6 @@ var customLaunchers = {
7587
platform: 'Windows 10',
7688
version: '14.14393'
7789
},
78-
'SL_ANDROID4.1': {base: 'SauceLabs', browserName: 'android', platform: 'Linux', version: '4.1'},
79-
'SL_ANDROID4.2': {base: 'SauceLabs', browserName: 'android', platform: 'Linux', version: '4.2'},
80-
'SL_ANDROID4.3': {base: 'SauceLabs', browserName: 'android', platform: 'Linux', version: '4.3'},
81-
'SL_ANDROID4.4': {base: 'SauceLabs', browserName: 'android', platform: 'Linux', version: '4.4'},
82-
'SL_ANDROID5': {base: 'SauceLabs', browserName: 'android', platform: 'Linux', version: '5.1'},
83-
'SL_ANDROID6': {
84-
base: 'SauceLabs',
85-
browserName: 'Chrome',
86-
platform: 'Android',
87-
version: '6.0',
88-
device: 'Android Emulator'
89-
},
9090
'SL_ANDROID7': {
9191
base: 'SauceLabs',
9292
browserName: 'Chrome',
@@ -115,17 +115,9 @@ var customLaunchers = {
115115
version: '10.0',
116116
device: 'Android GoogleAPI Emulator'
117117
},
118-
119118
'BS_CHROME': {base: 'BrowserStack', browser: 'chrome', os: 'OS X', os_version: 'Yosemite'},
120119
'BS_FIREFOX': {base: 'BrowserStack', browser: 'firefox', os: 'Windows', os_version: '10'},
121-
'BS_SAFARI7': {base: 'BrowserStack', browser: 'safari', os: 'OS X', os_version: 'Mavericks'},
122-
'BS_SAFARI8': {base: 'BrowserStack', browser: 'safari', os: 'OS X', os_version: 'Yosemite'},
123-
'BS_SAFARI9': {base: 'BrowserStack', browser: 'safari', os: 'OS X', os_version: 'El Capitan'},
124120
'BS_SAFARI10': {base: 'BrowserStack', browser: 'safari', os: 'OS X', os_version: 'Sierra'},
125-
'BS_IOS7': {base: 'BrowserStack', device: 'iPhone 5S', os: 'ios', os_version: '7.0'},
126-
'BS_IOS8': {base: 'BrowserStack', device: 'iPhone 6', os: 'ios', os_version: '8.3'},
127-
'BS_IOS9': {base: 'BrowserStack', device: 'iPhone 6S', os: 'ios', os_version: '9.1'},
128-
'BS_IOS10': {base: 'BrowserStack', device: 'iPhone SE', os: 'ios', os_version: '10.0'},
129121
'BS_IE9':
130122
{base: 'BrowserStack', browser: 'ie', browser_version: '9.0', os: 'Windows', os_version: '7'},
131123
'BS_IE10': {
@@ -145,37 +137,28 @@ var customLaunchers = {
145137
'BS_EDGE': {base: 'BrowserStack', browser: 'edge', os: 'Windows', os_version: '10'},
146138
'BS_WINDOWSPHONE':
147139
{base: 'BrowserStack', device: 'Nokia Lumia 930', os: 'winphone', os_version: '8.1'},
148-
'BS_ANDROID7': {base: 'BrowserStack', device: 'Google Pixel', os: 'android', os_version: '7.1'},
149-
'BS_ANDROID6': {base: 'BrowserStack', device: 'Google Nexus 6', os: 'android', os_version: '6.0'},
150-
'BS_ANDROID5': {base: 'BrowserStack', device: 'Google Nexus 5', os: 'android', os_version: '5.0'},
151-
'BS_ANDROID4.4': {base: 'BrowserStack', device: 'HTC One M8', os: 'android', os_version: '4.4'},
152-
'BS_ANDROID4.3':
153-
{base: 'BrowserStack', device: 'Samsung Galaxy S4', os: 'android', os_version: '4.3'},
154-
'BS_ANDROID4.2':
155-
{base: 'BrowserStack', device: 'Google Nexus 4', os: 'android', os_version: '4.2'},
156-
'BS_ANDROID4.1':
157-
{base: 'BrowserStack', device: 'Google Nexus 7', os: 'android', os_version: '4.1'}
140+
'BS_ANDROID7': {base: 'BrowserStack', device: 'Google Pixel', os: 'android', os_version: '7.1'}
158141
};
159142

160143
var sauceAliases = {
161144
'ALL': Object.keys(customLaunchers).filter(function(item) {
162145
return customLaunchers[item].base == 'SauceLabs';
163146
}),
164147
'DESKTOP': [
165-
'SL_CHROME', 'SL_FIREFOX', 'SL_IE9', 'SL_IE10', 'SL_IE11', 'SL_EDGE', 'SL_SAFARI7',
166-
'SL_SAFARI8', 'SL_SAFARI9', 'SL_SAFARI10'
148+
'SL_CHROME', 'SL_FIREFOX', 'SL_IE9', 'SL_IE10', 'SL_IE11', 'SL_EDGE', 'SL_SAFARI12', 'SL_SAFARI13', 'SL_FIREFOXESR'
167149
],
168150
'MOBILE': [
169-
'SL_ANDROID4.1', 'SL_ANDROID4.2', 'SL_ANDROID4.3', 'SL_ANDROID4.4', 'SL_ANDROID5',
170-
'SL_ANDROID6', 'SL_ANDROID7', 'SL_IOS7', 'SL_IOS8', 'SL_IOS9', 'SL_IOS10'
151+
'SL_ANDROID7', 'SL_ANDROID8', 'SL_ANDROID9', 'SL_ANDROID10', 'SL_IOS12', 'SL_IOS13'
171152
],
172153
'ANDROID': [
173-
'SL_ANDROID4.1', 'SL_ANDROID4.2', 'SL_ANDROID4.3', 'SL_ANDROID4.4', 'SL_ANDROID5',
174-
'SL_ANDROID6', 'SL_ANDROID7'
154+
'SL_ANDROID7', 'SL_ANDROID8', 'SL_ANDROID9', 'SL_ANDROID10'
155+
],
156+
'FIREFOX': [
157+
'SL_FIREFOXESR'
175158
],
176159
'IE': ['SL_IE9', 'SL_IE10', 'SL_IE11'],
177-
'IOS': ['SL_IOS7', 'SL_IOS8', 'SL_IOS9', 'SL_IOS10'],
178-
'SAFARI': ['SL_SAFARI7', 'SL_SAFARI8', 'SL_SAFARI9', 'SL_SAFARI10'],
160+
'IOS': ['SL_IOS12', 'SL_IOS13'],
161+
'SAFARI': ['SL_SAFARI12', 'SL_SAFARI13'],
179162
'BETA': ['SL_CHROMEBETA', 'SL_FIREFOXBETA'],
180163
'DEV': ['SL_CHROMEDEV', 'SL_FIREFOXDEV'],
181164
'CI_REQUIRED': buildConfiguration('unitTest', 'SL', true),
@@ -187,17 +170,15 @@ var browserstackAliases = {
187170
return customLaunchers[item].base == 'BrowserStack';
188171
}),
189172
'DESKTOP': [
190-
'BS_CHROME', 'BS_FIREFOX', 'BS_IE9', 'BS_IE10', 'BS_IE11', 'BS_EDGE', 'BS_SAFARI7',
191-
'BS_SAFARI8', 'BS_SAFARI9', 'BS_SAFARI10'
173+
'BS_CHROME', 'BS_FIREFOX', 'BS_IE9', 'BS_IE10', 'BS_IE11', 'BS_EDGE',
192174
],
193175
'MOBILE': [
194-
'BS_ANDROID4.3', 'BS_ANDROID4.4', 'BS_ANDROID5', 'BS_ANDROID6', 'BS_ANDROID7', 'BS_IOS7',
195-
'BS_IOS8', 'BS_IOS9', 'BS_IOS10', 'BS_WINDOWSPHONE'
176+
'BS_ANDROID7', 'BS_WINDOWSPHONE'
196177
],
197-
'ANDROID': ['BS_ANDROID4.3', 'BS_ANDROID4.4', 'BS_ANDROID5', 'BS_ANDROID6', 'BS_ANDROID7'],
178+
'ANDROID': ['BS_ANDROID7'],
198179
'IE': ['BS_IE9', 'BS_IE10', 'BS_IE11'],
199-
'IOS': ['BS_IOS7', 'BS_IOS8', 'BS_IOS9', 'BS_IOS10'],
200-
'SAFARI': ['BS_SAFARI7', 'BS_SAFARI8', 'BS_SAFARI9', 'BS_SAFARI10'],
180+
'IOS': [],
181+
'SAFARI': [],
201182
'CI_REQUIRED': buildConfiguration('unitTest', 'BS', true),
202183
'CI_OPTIONAL': buildConfiguration('unitTest', 'BS', false)
203184
};

0 commit comments

Comments
 (0)