Skip to content

Commit 6d564e1

Browse files
committed
build: adjust browserstack version
Changes the Browserstack version in an attempt to fix the CI.
1 parent eb32025 commit 6d564e1

File tree

4 files changed

+47
-30
lines changed

4 files changed

+47
-30
lines changed

package.json

Lines changed: 1 addition & 1 deletion
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/circleci/run-browserstack-tests.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ cd ${projectDir}
1414
export BROWSER_STACK_ACCESS_KEY=`echo ${BROWSER_STACK_ACCESS_KEY} | rev`
1515

1616
# Start tunnel and wait for it being ready.
17-
./scripts/browserstack/start-tunnel.sh &
18-
./scripts/browserstack/wait-tunnel.sh
17+
# ./scripts/browserstack/start-tunnel.sh &
18+
# ./scripts/browserstack/wait-tunnel.sh
1919

2020
# Setup the test platform environment variable that will be read
2121
# by the Karma configuration script.
@@ -26,7 +26,7 @@ yarn gulp ci:test
2626

2727
# Kill the Browserstack tunnel. This is necessary in order to avoid rate-limit
2828
# errors that cause the unit tests to be flaky.
29-
./scripts/browserstack/stop-tunnel.sh
29+
# ./scripts/browserstack/stop-tunnel.sh
3030

3131
# Wait for all sub processes to terminate properly.
3232
wait

test/karma.conf.js

Lines changed: 1 addition & 1 deletion
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

Lines changed: 42 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -2861,9 +2861,9 @@ blocking-proxy@^1.0.0:
28612861
minimist "^1.2.0"
28622862

28632863
bluebird@^3.3.0:
2864-
version "3.5.3"
2865-
resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.5.3.tgz#7d01c6f9616c9a51ab0f8c549a79dfe6ec33efa7"
2866-
integrity sha512-/qKPUQlaW1OyR51WeCPBvRnAlnZFUJkCSG5HzGnuIqhgyJtF+T94lFnn33eiazjRm2LAHVy2guNnaq48X9SJuw==
2864+
version "3.7.2"
2865+
resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.2.tgz#9f229c15be272454ffa973ace0dbee79a1b0c36f"
2866+
integrity sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==
28672867

28682868
bluebird@~3.4.1:
28692869
version "3.4.7"
@@ -3702,16 +3702,16 @@ [email protected], [email protected]:
37023702
resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b"
37033703
integrity sha1-BDP0TYCWgP3rYO0mDxsMJi6CpAs=
37043704

3705-
colors@^1.1.0, colors@^1.1.2:
3706-
version "1.3.2"
3707-
resolved "https://registry.yarnpkg.com/colors/-/colors-1.3.2.tgz#2df8ff573dfbf255af562f8ce7181d6b971a359b"
3708-
integrity sha512-rhP0JSBGYvpcNQj4s5AdShMeE5ahMop96cTeDl/v9qQQm2fYClE2QXZRi8wLzc+GmXSxdIqqbOIAhyObEXDbfQ==
3709-
3710-
colors@^1.2.1:
3705+
colors@^1.1.0, colors@^1.2.1:
37113706
version "1.4.0"
37123707
resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"
37133708
integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==
37143709

3710+
colors@^1.1.2:
3711+
version "1.3.2"
3712+
resolved "https://registry.yarnpkg.com/colors/-/colors-1.3.2.tgz#2df8ff573dfbf255af562f8ce7181d6b971a359b"
3713+
integrity sha512-rhP0JSBGYvpcNQj4s5AdShMeE5ahMop96cTeDl/v9qQQm2fYClE2QXZRi8wLzc+GmXSxdIqqbOIAhyObEXDbfQ==
3714+
37153715
colors@~1.2.1:
37163716
version "1.2.5"
37173717
resolved "https://registry.yarnpkg.com/colors/-/colors-1.2.5.tgz#89c7ad9a374bc030df8013241f68136ed8835afc"
@@ -3859,7 +3859,7 @@ connect-history-api-fallback@^1:
38593859
resolved "https://registry.yarnpkg.com/connect-history-api-fallback/-/connect-history-api-fallback-1.6.0.tgz#8b32089359308d111115d81cad3fceab888f97bc"
38603860
integrity sha512-e54B99q/OUoH64zYYRf3HBP5z24G38h5D3qXu23JGRoigpX5Ss4r9ZnDk3g0Z8uQC2x2lPaJ+UlWBc1ZWBWdLg==
38613861

3862-
[email protected], connect@^3.6.0, connect@^3.6.2:
3862+
[email protected], connect@^3.6.2:
38633863
version "3.6.6"
38643864
resolved "https://registry.yarnpkg.com/connect/-/connect-3.6.6.tgz#09eff6c55af7236e137135a72574858b6786f524"
38653865
integrity sha1-Ce/2xVr3I24TcTWnJXSFi2eG9SQ=
@@ -3869,6 +3869,16 @@ [email protected], connect@^3.6.0, connect@^3.6.2:
38693869
parseurl "~1.3.2"
38703870
utils-merge "1.0.1"
38713871

3872+
connect@^3.6.0:
3873+
version "3.7.0"
3874+
resolved "https://registry.yarnpkg.com/connect/-/connect-3.7.0.tgz#5d49348910caa5e07a01800b030d0c35f20484f8"
3875+
integrity sha512-ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ==
3876+
dependencies:
3877+
debug "2.6.9"
3878+
finalhandler "1.1.2"
3879+
parseurl "~1.3.3"
3880+
utils-merge "1.0.1"
3881+
38723882
console-control-strings@^1.0.0, console-control-strings@~1.1.0:
38733883
version "1.1.0"
38743884
resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
@@ -4291,13 +4301,20 @@ debug@=3.1.0, debug@~3.1.0:
42914301
dependencies:
42924302
ms "2.0.0"
42934303

4294-
debug@^3.0.0, debug@^3.1.0, debug@^3.1.1, debug@^3.2.6:
4304+
debug@^3.0.0, debug@^3.1.0, debug@^3.1.1:
42954305
version "3.2.6"
42964306
resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.6.tgz#e83d17de16d8a7efb7717edbe5fb10135eee629b"
42974307
integrity sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==
42984308
dependencies:
42994309
ms "^2.1.1"
43004310

4311+
debug@^3.2.6:
4312+
version "3.2.7"
4313+
resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a"
4314+
integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==
4315+
dependencies:
4316+
ms "^2.1.1"
4317+
43014318
decamelize-keys@^1.0.0, decamelize-keys@^1.1.0:
43024319
version "1.1.0"
43034320
resolved "https://registry.yarnpkg.com/decamelize-keys/-/decamelize-keys-1.1.0.tgz#d171a87933252807eb3cb61dc1c1445d078df2d9"
@@ -5476,7 +5493,7 @@ [email protected]:
54765493
statuses "~1.3.1"
54775494
unpipe "~1.0.0"
54785495

5479-
finalhandler@~1.1.2:
5496+
finalhandler@1.1.2, finalhandler@~1.1.2:
54805497
version "1.1.2"
54815498
resolved "https://registry.yarnpkg.com/finalhandler/-/finalhandler-1.1.2.tgz#b7e7d000ffd11938d0fdb053506f6ebabe9f587d"
54825499
integrity sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==
@@ -5658,9 +5675,9 @@ flat-cache@^3.0.4:
56585675
rimraf "^3.0.2"
56595676

56605677
flatted@^2.0.0:
5661-
version "2.0.0"
5662-
resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.0.tgz#55122b6536ea496b4b44893ee2608141d10d9916"
5663-
integrity sha512-R+H8IZclI8AAkSBRQJLVOsxwAoHd6WC40b4QTNWIjzAa6BXOBfQcM587MXDTVPeYaopFNWHUFLx7eNmHDSxMWg==
5678+
version "2.0.2"
5679+
resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.2.tgz#4575b21e2bcee7434aa9be662f4b7b5f9c2b5138"
5680+
integrity sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==
56645681

56655682
flatted@^3.1.0:
56665683
version "3.1.0"
@@ -7785,7 +7802,7 @@ kagekiri@^1.0.18:
77857802
resolved "https://registry.yarnpkg.com/kagekiri/-/kagekiri-1.4.0.tgz#d02825c906f80c59a3c890ec8032d565d6d66cfc"
77867803
integrity sha512-pYPexgf7jIML67DZGvTasv+smbKHPKh8fC2LyBflAwAwLRyhl9Ti5k3UBlWLOmBHOdvGdVNTnvh9AZNvoxQaAw==
77877804

7788-
karma-browserstack-launcher@^1.3.0:
7805+
karma-browserstack-launcher@1.6.0:
77897806
version "1.6.0"
77907807
resolved "https://registry.yarnpkg.com/karma-browserstack-launcher/-/karma-browserstack-launcher-1.6.0.tgz#2f6000647073e77ae296653b8830b279669766ef"
77917808
integrity sha512-Y/UWPdHZkHIVH2To4GWHCTzmrsB6H7PBWy6pw+TWz5sr4HW2mcE+Uj6qWgoVNxvQU1Pfn5LQQzI6EQ65p8QbiQ==
@@ -8924,9 +8941,9 @@ mime@^2.2.0:
89248941
integrity sha512-RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA==
89258942

89268943
mime@^2.3.1:
8927-
version "2.4.0"
8928-
resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.0.tgz#e051fd881358585f3279df333fe694da0bcffdd6"
8929-
integrity sha512-ikBcWwyqXQSHKtciCcctu9YfPbFYZ4+gbHEmE0Q8jzcTYQg5dHCr3g2wwAZjPoJfQVXZq6KXAjpXOTf5/cjT7w==
8944+
version "2.4.7"
8945+
resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.7.tgz#962aed9be0ed19c91fd7dc2ece5d7f4e89a90d74"
8946+
integrity sha512-dhNd1uA2u397uQk3Nv5LM4lm93WYDUXFn3Fu291FJerns4jyTudqhIWe4W04YLy7Uk1tm1Ore04NpjRvQp/NPA==
89308947

89318948
mimic-fn@^1.0.0:
89328949
version "1.2.0"
@@ -10519,16 +10536,16 @@ quick-lru@^4.0.1:
1051910536
resolved "https://registry.yarnpkg.com/quick-lru/-/quick-lru-4.0.1.tgz#5b8878f113a58217848c6482026c73e1ba57727f"
1052010537
integrity sha512-ARhCpm70fzdcvNQfPoy49IaanKkTlRWF2JMzqhcJbhSFRZv7nPTvZJdcY7301IPmvW+/p0RgIWnQDLJxifsQ7g==
1052110538

10522-
range-parser@^1.2.0, range-parser@~1.2.0:
10523-
version "1.2.0"
10524-
resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e"
10525-
integrity sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4=
10526-
10527-
range-parser@~1.2.1:
10539+
range-parser@^1.2.0, range-parser@~1.2.1:
1052810540
version "1.2.1"
1052910541
resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.1.tgz#3cf37023d199e1c24d1a55b84800c2f3e6468031"
1053010542
integrity sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==
1053110543

10544+
range-parser@~1.2.0:
10545+
version "1.2.0"
10546+
resolved "https://registry.yarnpkg.com/range-parser/-/range-parser-1.2.0.tgz#f49be6b487894ddc40dcc94a322f611092e00d5e"
10547+
integrity sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4=
10548+
1053210549
1053310550
version "2.4.0"
1053410551
resolved "https://registry.yarnpkg.com/raw-body/-/raw-body-2.4.0.tgz#a1ce6fb9c9bc356ca52e89256ab59059e13d0332"

0 commit comments

Comments
 (0)