Skip to content

Commit 13513f2

Browse files
authored
build: adjust browserstack version (#21383) (#21385)
Changes the Browserstack version in an attempt to fix the CI.
1 parent c535444 commit 13513f2

File tree

7 files changed

+49
-178
lines changed

7 files changed

+49
-178
lines changed

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@
132132
"jasmine-core": "^3.5.0",
133133
"kagekiri": "^1.0.18",
134134
"karma": "^4.4.1",
135-
"karma-browserstack-launcher": "^1.3.0",
135+
"karma-browserstack-launcher": "^1.6.0",
136136
"karma-chrome-launcher": "^3.1.0",
137137
"karma-firefox-launcher": "^2.0.0",
138138
"karma-jasmine": "^4.0.1",

scripts/browserstack/start-tunnel.sh

-74
This file was deleted.

scripts/browserstack/stop-tunnel.sh

-23
This file was deleted.

scripts/browserstack/wait-tunnel.sh

-46
This file was deleted.

scripts/circleci/run-browserstack-tests.sh

-8
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,12 @@ cd ${projectDir}
1313
# Decode access token and make it accessible for child processes.
1414
export BROWSER_STACK_ACCESS_KEY=`echo ${BROWSER_STACK_ACCESS_KEY} | rev`
1515

16-
# Start tunnel and wait for it being ready.
17-
./scripts/browserstack/start-tunnel.sh &
18-
./scripts/browserstack/wait-tunnel.sh
19-
2016
# Setup the test platform environment variable that will be read
2117
# by the Karma configuration script.
2218
export TEST_PLATFORM="browserstack"
2319

2420
# Run the unit tests on Browserstack with Karma.
2521
yarn gulp ci:test
2622

27-
# Kill the Browserstack tunnel. This is necessary in order to avoid rate-limit
28-
# errors that cause the unit tests to be flaky.
29-
./scripts/browserstack/stop-tunnel.sh
30-
3123
# Wait for all sub processes to terminate properly.
3224
wait

test/karma.conf.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ module.exports = config => {
9797

9898
browserStack: {
9999
project: 'Angular Material Unit Tests',
100-
startTunnel: false,
100+
startTunnel: true,
101101
retryLimit: 3,
102102
timeout: 1800,
103103
video: false,

yarn.lock

+47-25
Original file line numberDiff line numberDiff line change
@@ -2679,9 +2679,9 @@ blocking-proxy@^1.0.0:
26792679
minimist "^1.2.0"
26802680

26812681
bluebird@^3.3.0:
2682-
version "3.5.3"
2683-
resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.3.tgz#7d01c6f9616c9a51ab0f8c549a79dfe6ec33efa7"
2684-
integrity sha512-/qKPUQlaW1OyR51WeCPBvRnAlnZFUJkCSG5HzGnuIqhgyJtF+T94lFnn33eiazjRm2LAHVy2guNnaq48X9SJuw==
2682+
version "3.7.2"
2683+
resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
2684+
integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
26852685

26862686
bluebird@~3.4.1:
26872687
version "3.4.7"
@@ -3540,7 +3540,12 @@ [email protected], [email protected]:
35403540
resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b"
35413541
integrity sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs=
35423542

3543-
colors@^1.1.0, colors@^1.1.2:
3543+
colors@^1.1.0:
3544+
version "1.4.0"
3545+
resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"
3546+
integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==
3547+
3548+
colors@^1.1.2:
35443549
version "1.3.2"
35453550
resolved "https://registry.yarnpkg.com/colors/-/colors-1.3.2.tgz#2df8ff573dfbf255af562f8ce7181d6b971a359b"
35463551
integrity sha512-rhP0JSBGYvpcNQj4s5AdShMeE5ahMop96cTeDl/v9qQQm2fYClE2QXZRi8wLzc+GmXSxdIqqbOIAhyObEXDbfQ==
@@ -3710,7 +3715,7 @@ connect-query@^1.0.0:
37103715
dependencies:
37113716
qs "~6.4.0"
37123717

3713-
[email protected], connect@^3.6.0, connect@^3.6.2:
3718+
[email protected], connect@^3.6.2:
37143719
version "3.6.6"
37153720
resolved "https://registry.yarnpkg.com/connect/-/connect-3.6.6.tgz#09eff6c55af7236e137135a72574858b6786f524"
37163721
integrity sha1-Ce/2xVr3I24TcTWnJXSFi2eG9SQ=
@@ -3720,6 +3725,16 @@ [email protected], connect@^3.6.0, connect@^3.6.2:
37203725
parseurl "~1.3.2"
37213726
utils-merge "1.0.1"
37223727

3728+
connect@^3.6.0:
3729+
version "3.7.0"
3730+
resolved "https://registry.yarnpkg.com/connect/-/connect-3.7.0.tgz#5d49348910caa5e07a01800b030d0c35f20484f8"
3731+
integrity sha512-ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ==
3732+
dependencies:
3733+
debug "2.6.9"
3734+
finalhandler "1.1.2"
3735+
parseurl "~1.3.3"
3736+
utils-merge "1.0.1"
3737+
37233738
console-control-strings@^1.0.0, console-control-strings@~1.1.0:
37243739
version "1.1.0"
37253740
resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
@@ -4155,13 +4170,20 @@ debug@=3.1.0, debug@~3.1.0:
41554170
dependencies:
41564171
ms "2.0.0"
41574172

4158-
debug@^3.0.0, debug@^3.1.0, debug@^3.1.1, debug@^3.2.6:
4173+
debug@^3.0.0, debug@^3.1.0, debug@^3.1.1:
41594174
version "3.2.6"
41604175
resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
41614176
integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==
41624177
dependencies:
41634178
ms "^2.1.1"
41644179

4180+
debug@^3.2.6:
4181+
version "3.2.7"
4182+
resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a"
4183+
integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==
4184+
dependencies:
4185+
ms "^2.1.1"
4186+
41654187
decamelize-keys@^1.0.0, decamelize-keys@^1.1.0:
41664188
version "1.1.0"
41674189
resolved "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.0.tgz#d171a87933252807eb3cb61dc1c1445d078df2d9"
@@ -5218,7 +5240,7 @@ [email protected]:
52185240
statuses "~1.3.1"
52195241
unpipe "~1.0.0"
52205242

5221-
finalhandler@~1.1.2:
5243+
finalhandler@1.1.2, finalhandler@~1.1.2:
52225244
version "1.1.2"
52235245
resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d"
52245246
integrity sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==
@@ -5386,9 +5408,9 @@ flat-cache@^2.0.1:
53865408
write "1.0.3"
53875409

53885410
flatted@^2.0.0:
5389-
version "2.0.0"
5390-
resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.0.tgz#55122b6536ea496b4b44893ee2608141d10d9916"
5391-
integrity sha512-R+H8IZclI8AAkSBRQJLVOsxwAoHd6WC40b4QTNWIjzAa6BXOBfQcM587MXDTVPeYaopFNWHUFLx7eNmHDSxMWg==
5411+
version "2.0.2"
5412+
resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.2.tgz#4575b21e2bcee7434aa9be662f4b7b5f9c2b5138"
5413+
integrity sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==
53925414

53935415
flatten@^1.0.2:
53945416
version "1.0.2"
@@ -7404,13 +7426,13 @@ kagekiri@^1.0.18:
74047426
resolved "https://registry.yarnpkg.com/kagekiri/-/kagekiri-1.4.0.tgz#d02825c906f80c59a3c890ec8032d565d6d66cfc"
74057427
integrity sha512-pYPexgf7jIML67DZGvTasv+smbKHPKh8fC2LyBflAwAwLRyhl9Ti5k3UBlWLOmBHOdvGdVNTnvh9AZNvoxQaAw==
74067428

7407-
karma-browserstack-launcher@^1.3.0:
7408-
version "1.3.0"
7409-
resolved "https://registry.yarnpkg.com/karma-browserstack-launcher/-/karma-browserstack-launcher-1.3.0.tgz#61fe3d36b1cf10681e40f9d874bf37271fb1c674"
7410-
integrity sha512-LrPf5sU/GISkEElWyoy06J8x0c8BcOjjOwf61Wqu6M0aWQu0Eoqm9yh3xON64/ByST/CEr0GsWiREQ/EIEMd4Q==
7429+
karma-browserstack-launcher@^1.6.0:
7430+
version "1.6.0"
7431+
resolved "https://registry.yarnpkg.com/karma-browserstack-launcher/-/karma-browserstack-launcher-1.6.0.tgz#2f6000647073e77ae296653b8830b279669766ef"
7432+
integrity sha512-Y/UWPdHZkHIVH2To4GWHCTzmrsB6H7PBWy6pw+TWz5sr4HW2mcE+Uj6qWgoVNxvQU1Pfn5LQQzI6EQ65p8QbiQ==
74117433
dependencies:
7412-
browserstack "1.5.0"
7413-
browserstacktunnel-wrapper "~2.0.1"
7434+
browserstack "~1.5.1"
7435+
browserstack-local "^1.3.7"
74147436
q "~1.5.0"
74157437

74167438
karma-chrome-launcher@^3.1.0:
@@ -8503,9 +8525,9 @@ [email protected], mime@^1.4.1:
85038525
integrity sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==
85048526

85058527
mime@^2.3.1:
8506-
version "2.4.0"
8507-
resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.0.tgz#e051fd881358585f3279df333fe694da0bcffdd6"
8508-
integrity sha512-ikBcWwyqXQSHKtciCcctu9YfPbFYZ4+gbHEmE0Q8jzcTYQg5dHCr3g2wwAZjPoJfQVXZq6KXAjpXOTf5/cjT7w==
8528+
version "2.4.7"
8529+
resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.7.tgz#962aed9be0ed19c91fd7dc2ece5d7f4e89a90d74"
8530+
integrity sha512-dhNd1uA2u397uQk3Nv5LM4lm93WYDUXFn3Fu291FJerns4jyTudqhIWe4W04YLy7Uk1tm1Ore04NpjRvQp/NPA==
85098531

85108532
mimic-fn@^1.0.0:
85118533
version "1.2.0"
@@ -9999,16 +10021,16 @@ quick-lru@^4.0.1:
999910021
resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-4.0.1.tgz#5b8878f113a58217848c6482026c73e1ba57727f"
1000010022
integrity sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==
1000110023

10002-
range-parser@^1.2.0, range-parser@~1.2.0:
10003-
version "1.2.0"
10004-
resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e"
10005-
integrity sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4=
10006-
10007-
range-parser@~1.2.1:
10024+
range-parser@^1.2.0, range-parser@~1.2.1:
1000810025
version "1.2.1"
1000910026
resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031"
1001010027
integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==
1001110028

10029+
range-parser@~1.2.0:
10030+
version "1.2.0"
10031+
resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e"
10032+
integrity sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4=
10033+
1001210034
1001310035
version "2.3.3"
1001410036
resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.3.3.tgz#1b324ece6b5706e153855bc1148c65bb7f6ea0c3"

0 commit comments

Comments
 (0)