Skip to content

Commit 9defdce

Browse files
JonasBaJonasBa
authored
ci(profiling): Fix yarn timeout for Windows (#14543)
Timeout was being set after dependencies were installed and typescript pkg is not necessary (probably left from migration from the repo)
1 parent c8e81d5 commit 9defdce

File tree

4 files changed

+63
-15
lines changed

4 files changed

+63
-15
lines changed

‎.github/workflows/build.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1408,6 +1408,10 @@ jobs:
14081408
key: ${{ needs.job_build.outputs.dependency_cache_key }}
14091409
enableCrossOsArchive: true
14101410

1411+
- name: Increase yarn network timeout on Windows
1412+
if: contains(matrix.os, 'windows')
1413+
run: yarn config set network-timeout 600000 -g
1414+
14111415
- name: Install dependencies
14121416
env:
14131417
SKIP_PLAYWRIGHT_BROWSER_INSTALL: "1"
@@ -1418,10 +1422,6 @@ jobs:
14181422
run: |
14191423
git config --global --add safe.directory "*"
14201424
1421-
- name: Increase yarn network timeout on Windows
1422-
if: contains(matrix.os, 'windows')
1423-
run: yarn config set network-timeout 600000 -g
1424-
14251425
- name: Setup python
14261426
uses: actions/setup-python@v5
14271427
if: ${{ !contains(matrix.container, 'alpine') }}

‎packages/profiling-node/package.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,7 @@
8585
"@types/node-abi": "^3.0.3",
8686
"clang-format": "^1.8.0",
8787
"cross-env": "^7.0.3",
88-
"node-gyp": "^9.4.1",
89-
"typescript": "^4.9.5"
88+
"node-gyp": "^9.4.1"
9089
},
9190
"volta": {
9291
"extends": "../../package.json"

‎packages/profiling-node/src/cpu_profiler.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,7 @@ export function importCppBindingsModule(): PrivateV8CpuProfilerBindings {
143143
return require('../sentry_cpu_profiler-linux-arm64-musl-127.node');
144144
}
145145
}
146+
146147
if (stdlib === 'glibc') {
147148
if (abi === '93') {
148149
return require('../sentry_cpu_profiler-linux-arm64-glibc-93.node');

‎yarn.lock‎

Lines changed: 57 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9964,8 +9964,17 @@
99649964
dependencies:
99659965
"@types/unist" "*"
99669966

9967-
"@types/history-4@npm:@types/history@4.7.8", "@types/history-5@npm:@types/history@4.7.8", "@types/history@*":
9968-
name "@types/history-4"
9967+
"@types/history-4@npm:@types/history@4.7.8":
9968+
version "4.7.8"
9969+
resolved "https://registry.yarnpkg.com/@types/history/-/history-4.7.8.tgz#49348387983075705fe8f4e02fb67f7daaec4934"
9970+
integrity sha512-S78QIYirQcUoo6UJZx9CSP0O2ix9IaeAXwQi26Rhr/+mg7qqPy8TzaxHSUut7eGjL8WmLccT7/MXf304WjqHcA==
9971+
9972+
"@types/history-5@npm:@types/history@4.7.8":
9973+
version "4.7.8"
9974+
resolved "https://registry.yarnpkg.com/@types/history/-/history-4.7.8.tgz#49348387983075705fe8f4e02fb67f7daaec4934"
9975+
integrity sha512-S78QIYirQcUoo6UJZx9CSP0O2ix9IaeAXwQi26Rhr/+mg7qqPy8TzaxHSUut7eGjL8WmLccT7/MXf304WjqHcA==
9976+
9977+
"@types/history@*":
99699978
version "4.7.8"
99709979
resolved "https://registry.yarnpkg.com/@types/history/-/history-4.7.8.tgz#49348387983075705fe8f4e02fb67f7daaec4934"
99719980
integrity sha512-S78QIYirQcUoo6UJZx9CSP0O2ix9IaeAXwQi26Rhr/+mg7qqPy8TzaxHSUut7eGjL8WmLccT7/MXf304WjqHcA==
@@ -10292,7 +10301,15 @@
1029210301
"@types/history" "^3"
1029310302
"@types/react" "*"
1029410303

10295-
"@types/react-router-4@npm:@types/react-router@5.1.14", "@types/react-router-5@npm:@types/react-router@5.1.14":
10304+
"@types/react-router-4@npm:@types/react-router@5.1.14":
10305+
version "5.1.14"
10306+
resolved "https://registry.yarnpkg.com/@types/react-router/-/react-router-5.1.14.tgz#e0442f4eb4c446541ad7435d44a97f8fe6df40da"
10307+
integrity sha512-LAJpqYUaCTMT2anZheoidiIymt8MuX286zoVFPM3DVb23aQBH0mAkFvzpd4LKqiolV8bBtZWT5Qp7hClCNDENw==
10308+
dependencies:
10309+
"@types/history" "*"
10310+
"@types/react" "*"
10311+
10312+
"@types/react-router-5@npm:@types/react-router@5.1.14":
1029610313
version "5.1.14"
1029710314
resolved "https://registry.yarnpkg.com/@types/react-router/-/react-router-5.1.14.tgz#e0442f4eb4c446541ad7435d44a97f8fe6df40da"
1029810315
integrity sha512-LAJpqYUaCTMT2anZheoidiIymt8MuX286zoVFPM3DVb23aQBH0mAkFvzpd4LKqiolV8bBtZWT5Qp7hClCNDENw==
@@ -28654,8 +28671,7 @@ react-is@^18.0.0:
2865428671
dependencies:
2865528672
"@remix-run/router" "1.0.2"
2865628673

28657-
"react-router-6@npm:react-router@6.3.0", react-router@6.3.0:
28658-
name react-router-6
28674+
"react-router-6@npm:react-router@6.3.0":
2865928675
version "6.3.0"
2866028676
resolved "https://registry.yarnpkg.com/react-router/-/react-router-6.3.0.tgz#3970cc64b4cb4eae0c1ea5203a80334fdd175557"
2866128677
integrity sha512-7Wh1DzVQ+tlFjkeo+ujvjSqSJmkt1+8JO+T5xklPlgrh70y7ogx75ODRW0ThWhY7S+6yEDks8TYrtQe/aoboBQ==
@@ -28670,6 +28686,13 @@ react-router-dom@^6.2.2:
2867028686
history "^5.2.0"
2867128687
react-router "6.3.0"
2867228688

28689+
react-router@6.3.0:
28690+
version "6.3.0"
28691+
resolved "https://registry.yarnpkg.com/react-router/-/react-router-6.3.0.tgz#3970cc64b4cb4eae0c1ea5203a80334fdd175557"
28692+
integrity sha512-7Wh1DzVQ+tlFjkeo+ujvjSqSJmkt1+8JO+T5xklPlgrh70y7ogx75ODRW0ThWhY7S+6yEDks8TYrtQe/aoboBQ==
28693+
dependencies:
28694+
history "^5.2.0"
28695+
2867328696
react@^18.0.0:
2867428697
version "18.0.0"
2867528698
resolved "https://registry.yarnpkg.com/react/-/react-18.0.0.tgz#b468736d1f4a5891f38585ba8e8fb29f91c3cb96"
@@ -31068,7 +31091,16 @@ string-template@~0.2.1:
3106831091
resolved "https://registry.yarnpkg.com/string-template/-/string-template-0.2.1.tgz#42932e598a352d01fc22ec3367d9d84eec6c9add"
3106931092
integrity sha1-QpMuWYo1LQH8IuwzZ9nYTuxsmt0=
3107031093

31071-
"string-width-cjs@npm:string-width@^4.2.0", string-width@4.2.3, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3:
31094+
"string-width-cjs@npm:string-width@^4.2.0":
31095+
version "4.2.3"
31096+
resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
31097+
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
31098+
dependencies:
31099+
emoji-regex "^8.0.0"
31100+
is-fullwidth-code-point "^3.0.0"
31101+
strip-ansi "^6.0.1"
31102+
31103+
string-width@4.2.3, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3:
3107231104
version "4.2.3"
3107331105
resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
3107431106
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -31180,7 +31212,14 @@ stringify-object@^3.2.1:
3118031212
is-obj "^1.0.1"
3118131213
is-regexp "^1.0.0"
3118231214

31183-
"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@6.0.1, strip-ansi@^6.0.0, strip-ansi@^6.0.1:
31215+
"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
31216+
version "6.0.1"
31217+
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
31218+
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
31219+
dependencies:
31220+
ansi-regex "^5.0.1"
31221+
31222+
strip-ansi@6.0.1, strip-ansi@^6.0.0, strip-ansi@^6.0.1:
3118431223
version "6.0.1"
3118531224
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
3118631225
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -32392,7 +32431,7 @@ typescript@4.6.4:
3239232431
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.6.4.tgz#caa78bbc3a59e6a5c510d35703f6a09877ce45e9"
3239332432
integrity sha512-9ia/jWHIEbo49HfjrLGfKbZSuWo9iTMwXO+Ca3pRsSpbsMbc7/IU8NKdCZVRRBafVPGnoJeFL76ZOAA84I9fEg==
3239432433

32395-
typescript@4.9.5, typescript@^4.9.5:
32434+
typescript@4.9.5:
3239632435
version "4.9.5"
3239732436
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.5.tgz#095979f9bcc0d09da324d58d03ce8f8374cbe65a"
3239832437
integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==
@@ -34221,7 +34260,16 @@ wrangler@^3.67.1:
3422134260
optionalDependencies:
3422234261
fsevents "~2.3.2"
3422334262

34224-
"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@7.0.0, wrap-ansi@^7.0.0:
34263+
"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
34264+
version "7.0.0"
34265+
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
34266+
integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
34267+
dependencies:
34268+
ansi-styles "^4.0.0"
34269+
string-width "^4.1.0"
34270+
strip-ansi "^6.0.0"
34271+
34272+
wrap-ansi@7.0.0, wrap-ansi@^7.0.0:
3422534273
version "7.0.0"
3422634274
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
3422734275
integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==

0 commit comments

Comments
 (0)