Skip to content

Commit d2d08c8

Browse files
authored
Merge branch 'develop' into timfish/feat/V8-v14-support
2 parents c1769d6 + 7a9837c commit d2d08c8

66 files changed

Lines changed: 773 additions & 1022 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/build.yml

Lines changed: 2 additions & 71 deletions
Original file line numberDiff line numberDiff line change
@@ -152,9 +152,6 @@ jobs:
152152
changed_node:
153153
${{ needs.job_get_metadata.outputs.changed_ci == 'true' || contains(steps.checkForAffected.outputs.affected,
154154
'@sentry/node') }}
155-
changed_node_overhead_action:
156-
${{ needs.job_get_metadata.outputs.changed_ci == 'true' || contains(steps.checkForAffected.outputs.affected,
157-
'@sentry-internal/node-overhead-gh-action') }}
158155
changed_deno:
159156
${{ needs.job_get_metadata.outputs.changed_ci == 'true' || contains(steps.checkForAffected.outputs.affected,
160157
'@sentry/deno') }}
@@ -208,37 +205,6 @@ jobs:
208205
# Only run comparison against develop if this is a PR
209206
comparison_branch: ${{ (github.event_name == 'pull_request' && github.base_ref) || ''}}
210207

211-
job_node_overhead_check:
212-
name: Node Overhead Check
213-
needs: [job_get_metadata, job_build]
214-
timeout-minutes: 15
215-
runs-on: ubuntu-24.04
216-
if:
217-
(needs.job_build.outputs.changed_node == 'true' && github.event_name == 'pull_request') ||
218-
(needs.job_build.outputs.changed_node_overhead_action == 'true' && github.event_name == 'pull_request') ||
219-
needs.job_get_metadata.outputs.is_base_branch == 'true' || needs.job_get_metadata.outputs.is_release == 'true'
220-
steps:
221-
- name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})
222-
uses: actions/checkout@v6
223-
with:
224-
ref: ${{ env.HEAD_COMMIT }}
225-
- name: Set up Node
226-
uses: actions/setup-node@v6
227-
with:
228-
node-version-file: 'package.json'
229-
- name: Restore caches
230-
uses: ./.github/actions/restore-cache
231-
with:
232-
dependency_cache_key: ${{ needs.job_build.outputs.dependency_cache_key }}
233-
- name: Check node overhead
234-
uses: ./dev-packages/node-overhead-gh-action
235-
env:
236-
DEBUG: '1'
237-
with:
238-
github_token: ${{ secrets.GITHUB_TOKEN }}
239-
# Only run comparison against develop if this is a PR
240-
comparison_branch: ${{ (github.event_name == 'pull_request' && github.base_ref) || ''}}
241-
242208
job_lint:
243209
name: Lint
244210
# Even though the linter only checks source code, not built code, it needs the built code in order check that all
@@ -605,6 +571,7 @@ jobs:
605571
with:
606572
token: ${{ secrets.GITHUB_TOKEN }}
607573
directory: dev-packages/browser-integration-tests
574+
enable-coverage: false
608575
name:
609576
browser-playwright-${{ matrix.bundle }}-${{ matrix.project }}${{ matrix.shard && format('-{0}',
610577
matrix.shard) || '' }}
@@ -669,6 +636,7 @@ jobs:
669636
with:
670637
token: ${{ secrets.GITHUB_TOKEN }}
671638
directory: dev-packages/browser-integration-tests
639+
enable-coverage: false
672640
name: browser-loader-${{ matrix.bundle }}
673641

674642
job_check_for_faulty_dts:
@@ -737,15 +705,6 @@ jobs:
737705
working-directory: dev-packages/node-integration-tests
738706
run: yarn test
739707

740-
- name: Parse and Upload Coverage
741-
if: cancelled() == false
742-
continue-on-error: true
743-
uses: getsentry/codecov-action@main
744-
with:
745-
token: ${{ secrets.GITHUB_TOKEN }}
746-
directory: dev-packages/node-integration-tests
747-
name: node-integration-${{ matrix.node }}${{ matrix.typescript && format('-ts{0}', matrix.typescript) || '' }}
748-
749708
job_node_core_integration_tests:
750709
name:
751710
Node (${{ matrix.node }})${{ (matrix.typescript && format(' (TS {0})', matrix.typescript)) || '' }} Node-Core
@@ -787,16 +746,6 @@ jobs:
787746
working-directory: dev-packages/node-core-integration-tests
788747
run: yarn test
789748

790-
- name: Parse and Upload Coverage
791-
if: cancelled() == false
792-
continue-on-error: true
793-
uses: getsentry/codecov-action@main
794-
with:
795-
token: ${{ secrets.GITHUB_TOKEN }}
796-
directory: dev-packages/node-core-integration-tests
797-
name:
798-
node-core-integration-${{ matrix.node }}${{ matrix.typescript && format('-ts{0}', matrix.typescript) || ''}}
799-
800749
job_cloudflare_integration_tests:
801750
name: Cloudflare Integration Tests
802751
needs: [job_get_metadata, job_build]
@@ -856,15 +805,6 @@ jobs:
856805
cd packages/remix
857806
yarn test:integration:ci
858807
859-
- name: Parse and Upload Coverage
860-
if: cancelled() == false
861-
continue-on-error: true
862-
uses: getsentry/codecov-action@main
863-
with:
864-
directory: packages/remix
865-
token: ${{ secrets.GITHUB_TOKEN }}
866-
name: ${{ matrix.node }}
867-
868808
job_e2e_prepare:
869809
name: Prepare E2E tests
870810
# We want to run this if:
@@ -1053,15 +993,6 @@ jobs:
1053993
retention-days: 7
1054994
if-no-files-found: ignore
1055995

1056-
- name: Parse and Upload Coverage
1057-
if: cancelled() == false
1058-
continue-on-error: true
1059-
uses: getsentry/codecov-action@main
1060-
with:
1061-
directory: dev-packages/e2e-tests
1062-
token: ${{ secrets.GITHUB_TOKEN }}
1063-
name: e2e-${{ matrix.test-application }}
1064-
1065996
# - We skip optional tests on release branches
1066997
job_optional_e2e_tests:
1067998
name: E2E ${{ matrix.label || matrix.test-application }} Test (optional)

.github/workflows/ci-metadata.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ jobs:
6161
6262
# Most changed packages are determined in job_build via Nx
6363
- name: Determine changed packages
64-
uses: dorny/paths-filter@v3.0.1
64+
uses: dorny/paths-filter@v4.0.1
6565
id: changed
6666
with:
6767
filters: |

.github/workflows/flaky-test-detector.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
browsers: 'chromium'
5656

5757
- name: Determine changed tests
58-
uses: dorny/paths-filter@v3.0.1
58+
uses: dorny/paths-filter@v4.0.1
5959
id: changed
6060
with:
6161
list-files: json

dev-packages/cloudflare-integration-tests/suites/tracing/propagation/worker-do/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ interface Env {
88
}
99

1010
class MyDurableObjectBase extends DurableObject<Env> {
11-
async fetch(request: Request) {
11+
async fetch(_request: Request) {
1212
return new Response('DO is fine');
1313
}
1414
}

dev-packages/cloudflare-integration-tests/suites/tracing/propagation/worker-service-binding/index-sub-worker.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ interface Env {
55
}
66

77
const myWorker = {
8-
async fetch(request: Request) {
8+
async fetch(_request: Request) {
99
return new Response('Hello from another worker!');
1010
},
1111
};

dev-packages/cloudflare-integration-tests/suites/tracing/propagation/workflow-do/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ interface Env {
99
}
1010

1111
class MyDurableObjectBase extends DurableObject<Env> {
12-
async fetch(request: Request) {
12+
async fetch(_request: Request) {
1313
return new Response('DO is fine');
1414
}
1515
}

dev-packages/node-core-integration-tests/suites/anr/app-path.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Sentry.setUser({ email: 'person@home.com' });
2525
Sentry.addBreadcrumb({ message: 'important message!' });
2626

2727
function longWork() {
28-
for (let i = 0; i < 20; i++) {
28+
for (let i = 0; i < 50; i++) {
2929
const salt = crypto.randomBytes(128).toString('base64');
3030
const hash = crypto.pbkdf2Sync('myPassword', salt, 10000, 512, 'sha512');
3131
assert.ok(hash);

dev-packages/node-core-integration-tests/suites/anr/basic-multiple.mjs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ Sentry.setUser({ email: 'person@home.com' });
2121
Sentry.addBreadcrumb({ message: 'important message!' });
2222

2323
function longWork() {
24-
for (let i = 0; i < 20; i++) {
24+
for (let i = 0; i < 50; i++) {
2525
const salt = crypto.randomBytes(128).toString('base64');
2626
const hash = crypto.pbkdf2Sync('myPassword', salt, 10000, 512, 'sha512');
2727
assert.ok(hash);

dev-packages/node-core-integration-tests/suites/anr/basic-session.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Sentry.setUser({ email: 'person@home.com' });
2020
Sentry.addBreadcrumb({ message: 'important message!' });
2121

2222
function longWork() {
23-
for (let i = 0; i < 20; i++) {
23+
for (let i = 0; i < 50; i++) {
2424
const salt = crypto.randomBytes(128).toString('base64');
2525
const hash = crypto.pbkdf2Sync('myPassword', salt, 10000, 512, 'sha512');
2626
assert.ok(hash);

dev-packages/node-core-integration-tests/suites/anr/basic.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Sentry.setUser({ email: 'person@home.com' });
2222
Sentry.addBreadcrumb({ message: 'important message!' });
2323

2424
function longWork() {
25-
for (let i = 0; i < 20; i++) {
25+
for (let i = 0; i < 50; i++) {
2626
const salt = crypto.randomBytes(128).toString('base64');
2727
const hash = crypto.pbkdf2Sync('myPassword', salt, 10000, 512, 'sha512');
2828
assert.ok(hash);

0 commit comments

Comments
 (0)