Skip to content

Commit b8cdef4

Browse files
authored
build: adjust browserstack version (#21383)
Changes the Browserstack version in an attempt to fix the CI.
1 parent 4efb44a commit b8cdef4

File tree

7 files changed

+44
-178
lines changed

7 files changed

+44
-178
lines changed

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@
133133
"jasmine-core": "^3.5.0",
134134
"kagekiri": "^1.0.18",
135135
"karma": "^4.4.1",
136-
"karma-browserstack-launcher": "^1.3.0",
136+
"karma-browserstack-launcher": "^1.6.0",
137137
"karma-chrome-launcher": "^3.1.0",
138138
"karma-firefox-launcher": "^2.0.0",
139139
"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

+42-25
Original file line numberDiff line numberDiff line change
@@ -2974,9 +2974,9 @@ blocking-proxy@^1.0.0:
29742974
minimist "^1.2.0"
29752975

29762976
bluebird@^3.3.0:
2977-
version "3.5.3"
2978-
resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.3.tgz#7d01c6f9616c9a51ab0f8c549a79dfe6ec33efa7"
2979-
integrity sha512-/qKPUQlaW1OyR51WeCPBvRnAlnZFUJkCSG5HzGnuIqhgyJtF+T94lFnn33eiazjRm2LAHVy2guNnaq48X9SJuw==
2977+
version "3.7.2"
2978+
resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
2979+
integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
29802980

29812981
bluebird@~3.4.1:
29822982
version "3.4.7"
@@ -3820,16 +3820,16 @@ [email protected], [email protected]:
38203820
resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b"
38213821
integrity sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs=
38223822

3823-
colors@^1.1.0, colors@^1.1.2:
3824-
version "1.3.2"
3825-
resolved "https://registry.yarnpkg.com/colors/-/colors-1.3.2.tgz#2df8ff573dfbf255af562f8ce7181d6b971a359b"
3826-
integrity sha512-rhP0JSBGYvpcNQj4s5AdShMeE5ahMop96cTeDl/v9qQQm2fYClE2QXZRi8wLzc+GmXSxdIqqbOIAhyObEXDbfQ==
3827-
3828-
colors@^1.2.1:
3823+
colors@^1.1.0, colors@^1.2.1:
38293824
version "1.4.0"
38303825
resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"
38313826
integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==
38323827

3828+
colors@^1.1.2:
3829+
version "1.3.2"
3830+
resolved "https://registry.yarnpkg.com/colors/-/colors-1.3.2.tgz#2df8ff573dfbf255af562f8ce7181d6b971a359b"
3831+
integrity sha512-rhP0JSBGYvpcNQj4s5AdShMeE5ahMop96cTeDl/v9qQQm2fYClE2QXZRi8wLzc+GmXSxdIqqbOIAhyObEXDbfQ==
3832+
38333833
colors@~1.2.1:
38343834
version "1.2.5"
38353835
resolved "https://registry.yarnpkg.com/colors/-/colors-1.2.5.tgz#89c7ad9a374bc030df8013241f68136ed8835afc"
@@ -3977,7 +3977,7 @@ connect-history-api-fallback@^1:
39773977
resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz#8b32089359308d111115d81cad3fceab888f97bc"
39783978
integrity sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==
39793979

3980-
[email protected], connect@^3.6.0, connect@^3.6.2:
3980+
[email protected], connect@^3.6.2:
39813981
version "3.6.6"
39823982
resolved "https://registry.yarnpkg.com/connect/-/connect-3.6.6.tgz#09eff6c55af7236e137135a72574858b6786f524"
39833983
integrity sha1-Ce/2xVr3I24TcTWnJXSFi2eG9SQ=
@@ -3987,6 +3987,16 @@ [email protected], connect@^3.6.0, connect@^3.6.2:
39873987
parseurl "~1.3.2"
39883988
utils-merge "1.0.1"
39893989

3990+
connect@^3.6.0:
3991+
version "3.7.0"
3992+
resolved "https://registry.yarnpkg.com/connect/-/connect-3.7.0.tgz#5d49348910caa5e07a01800b030d0c35f20484f8"
3993+
integrity sha512-ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ==
3994+
dependencies:
3995+
debug "2.6.9"
3996+
finalhandler "1.1.2"
3997+
parseurl "~1.3.3"
3998+
utils-merge "1.0.1"
3999+
39904000
console-control-strings@^1.0.0, console-control-strings@~1.1.0:
39914001
version "1.1.0"
39924002
resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
@@ -4409,13 +4419,20 @@ debug@=3.1.0, debug@~3.1.0:
44094419
dependencies:
44104420
ms "2.0.0"
44114421

4412-
debug@^3.0.0, debug@^3.1.0, debug@^3.1.1, debug@^3.2.6:
4422+
debug@^3.0.0, debug@^3.1.0, debug@^3.1.1:
44134423
version "3.2.6"
44144424
resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
44154425
integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==
44164426
dependencies:
44174427
ms "^2.1.1"
44184428

4429+
debug@^3.2.6:
4430+
version "3.2.7"
4431+
resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a"
4432+
integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==
4433+
dependencies:
4434+
ms "^2.1.1"
4435+
44194436
decamelize-keys@^1.0.0, decamelize-keys@^1.1.0:
44204437
version "1.1.0"
44214438
resolved "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.0.tgz#d171a87933252807eb3cb61dc1c1445d078df2d9"
@@ -5594,7 +5611,7 @@ [email protected]:
55945611
statuses "~1.3.1"
55955612
unpipe "~1.0.0"
55965613

5597-
finalhandler@~1.1.2:
5614+
finalhandler@1.1.2, finalhandler@~1.1.2:
55985615
version "1.1.2"
55995616
resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d"
56005617
integrity sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==
@@ -5776,9 +5793,9 @@ flat-cache@^3.0.4:
57765793
rimraf "^3.0.2"
57775794

57785795
flatted@^2.0.0:
5779-
version "2.0.0"
5780-
resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.0.tgz#55122b6536ea496b4b44893ee2608141d10d9916"
5781-
integrity sha512-R+H8IZclI8AAkSBRQJLVOsxwAoHd6WC40b4QTNWIjzAa6BXOBfQcM587MXDTVPeYaopFNWHUFLx7eNmHDSxMWg==
5796+
version "2.0.2"
5797+
resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.2.tgz#4575b21e2bcee7434aa9be662f4b7b5f9c2b5138"
5798+
integrity sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==
57825799

57835800
flatted@^3.1.0:
57845801
version "3.1.0"
@@ -7908,7 +7925,7 @@ kagekiri@^1.0.18:
79087925
resolved "https://registry.yarnpkg.com/kagekiri/-/kagekiri-1.4.0.tgz#d02825c906f80c59a3c890ec8032d565d6d66cfc"
79097926
integrity sha512-pYPexgf7jIML67DZGvTasv+smbKHPKh8fC2LyBflAwAwLRyhl9Ti5k3UBlWLOmBHOdvGdVNTnvh9AZNvoxQaAw==
79107927

7911-
karma-browserstack-launcher@^1.3.0:
7928+
karma-browserstack-launcher@^1.6.0:
79127929
version "1.6.0"
79137930
resolved "https://registry.yarnpkg.com/karma-browserstack-launcher/-/karma-browserstack-launcher-1.6.0.tgz#2f6000647073e77ae296653b8830b279669766ef"
79147931
integrity sha512-Y/UWPdHZkHIVH2To4GWHCTzmrsB6H7PBWy6pw+TWz5sr4HW2mcE+Uj6qWgoVNxvQU1Pfn5LQQzI6EQ65p8QbiQ==
@@ -9052,9 +9069,9 @@ mime@^2.2.0:
90529069
integrity sha512-RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA==
90539070

90549071
mime@^2.3.1:
9055-
version "2.4.0"
9056-
resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.0.tgz#e051fd881358585f3279df333fe694da0bcffdd6"
9057-
integrity sha512-ikBcWwyqXQSHKtciCcctu9YfPbFYZ4+gbHEmE0Q8jzcTYQg5dHCr3g2wwAZjPoJfQVXZq6KXAjpXOTf5/cjT7w==
9072+
version "2.4.7"
9073+
resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.7.tgz#962aed9be0ed19c91fd7dc2ece5d7f4e89a90d74"
9074+
integrity sha512-dhNd1uA2u397uQk3Nv5LM4lm93WYDUXFn3Fu291FJerns4jyTudqhIWe4W04YLy7Uk1tm1Ore04NpjRvQp/NPA==
90589075

90599076
mimic-fn@^1.0.0:
90609077
version "1.2.0"
@@ -10655,16 +10672,16 @@ quick-lru@^4.0.1:
1065510672
resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-4.0.1.tgz#5b8878f113a58217848c6482026c73e1ba57727f"
1065610673
integrity sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==
1065710674

10658-
range-parser@^1.2.0, range-parser@~1.2.0:
10659-
version "1.2.0"
10660-
resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e"
10661-
integrity sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4=
10662-
10663-
range-parser@~1.2.1:
10675+
range-parser@^1.2.0, range-parser@~1.2.1:
1066410676
version "1.2.1"
1066510677
resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031"
1066610678
integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==
1066710679

10680+
range-parser@~1.2.0:
10681+
version "1.2.0"
10682+
resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e"
10683+
integrity sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4=
10684+
1066810685
1066910686
version "2.4.0"
1067010687
resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.0.tgz#a1ce6fb9c9bc356ca52e89256ab59059e13d0332"

0 commit comments

Comments
 (0)