Skip to content

Commit e8655bb

Browse files
authored
Merge branch 'develop' into sig/astro-client-param
2 parents 43fdebb + bc87e33 commit e8655bb

File tree

7 files changed

+28
-19
lines changed

7 files changed

+28
-19
lines changed

.github/workflows/build.yml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,6 @@ env:
4747
${{ github.workspace }}/packages/*/lib
4848
${{ github.workspace }}/packages/ember/*.d.ts
4949
${{ github.workspace }}/packages/gatsby/*.d.ts
50-
${{ github.workspace }}/packages/utils/cjs
51-
${{ github.workspace }}/packages/utils/esm
5250
5351
BUILD_CACHE_TARBALL_KEY: tarball-${{ github.event.inputs.commit || github.sha }}
5452

@@ -950,13 +948,13 @@ jobs:
950948
retention-days: 7
951949

952950
- name: Pre-process E2E Test Dumps
953-
if: always()
951+
if: failure()
954952
run: |
955953
node ./scripts/normalize-e2e-test-dump-transaction-events.js
956954
957955
- name: Upload E2E Test Event Dumps
958956
uses: actions/upload-artifact@v4
959-
if: always()
957+
if: failure()
960958
with:
961959
name: E2E Test Dump (${{ matrix.label || matrix.test-application }})
962960
path: ${{ runner.temp }}/test-application/event-dumps
@@ -1062,13 +1060,13 @@ jobs:
10621060
run: pnpm ${{ matrix.assert-command || 'test:assert' }}
10631061

10641062
- name: Pre-process E2E Test Dumps
1065-
if: always()
1063+
if: failure()
10661064
run: |
10671065
node ./scripts/normalize-e2e-test-dump-transaction-events.js
10681066
10691067
- name: Upload E2E Test Event Dumps
10701068
uses: actions/upload-artifact@v4
1071-
if: always()
1069+
if: failure()
10721070
with:
10731071
name: E2E Test Dump (${{ matrix.label || matrix.test-application }})
10741072
path: ${{ runner.temp }}/test-application/event-dumps

dev-packages/e2e-tests/test-applications/aws-lambda-layer-cjs/package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,8 @@
1818
},
1919
"volta": {
2020
"extends": "../../package.json"
21+
},
22+
"sentryTest": {
23+
"skip": true
2124
}
2225
}

dev-packages/e2e-tests/test-applications/aws-lambda-layer-cjs/tests/basic.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ test('Lambda layer SDK bundle sends events', async ({ request }) => {
1818
);
1919

2020
child_process.execSync('pnpm start', {
21-
stdio: 'ignore',
21+
stdio: 'inherit',
2222
});
2323

2424
const transactionEvent = await transactionEventPromise;

dev-packages/e2e-tests/test-applications/aws-lambda-layer-esm/package.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,8 @@
1919
},
2020
"volta": {
2121
"extends": "../../package.json"
22+
},
23+
"sentryTest": {
24+
"skip": true
2225
}
2326
}

dev-packages/e2e-tests/test-applications/aws-lambda-layer-esm/tests/basic.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ test('Lambda layer SDK bundle sends events', async ({ request }) => {
1818
);
1919

2020
child_process.execSync('pnpm start', {
21-
stdio: 'ignore',
21+
stdio: 'inherit',
2222
});
2323

2424
const transactionEvent = await transactionEventPromise;

package.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,8 +148,7 @@
148148
"gauge/strip-ansi": "6.0.1",
149149
"wide-align/string-width": "4.2.3",
150150
"cliui/wrap-ansi": "7.0.0",
151-
"sucrase": "getsentry/sucrase#es2020-polyfills",
152-
"stylus": "0.0.1-security"
151+
"sucrase": "getsentry/sucrase#es2020-polyfills"
153152
},
154153
"version": "0.0.0",
155154
"name": "sentry-javascript",

yarn.lock

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,10 @@
7575
resolved "https://registry.yarnpkg.com/@actions/io/-/io-1.1.3.tgz#4cdb6254da7962b07473ff5c335f3da485d94d71"
7676
integrity sha512-wi9JjgKLYS7U/z8PPbco+PvTb/nRWjeoFlJ1Qer83k/3C5PHQi28hiVdeE2kHXmIL99mQFawx8qt/JPjZilJ8Q==
7777

78-
"@adobe/css-tools@^4.4.0":
79-
version "4.4.2"
80-
resolved "https://registry.yarnpkg.com/@adobe/css-tools/-/css-tools-4.4.2.tgz#c836b1bd81e6d62cd6cdf3ee4948bcdce8ea79c8"
81-
integrity sha512-baYZExFpsdkBNuvGKTKWCwKH57HRZLVtycZS05WTQNVOiXVSeAki3nU35zlRbToeMW8aHlJfyS+1C4BOv27q0A==
78+
"@adobe/css-tools@^4.0.1", "@adobe/css-tools@^4.4.0":
79+
version "4.4.3"
80+
resolved "https://registry.yarnpkg.com/@adobe/css-tools/-/css-tools-4.4.3.tgz#beebbefb0264fdeb32d3052acae0e0d94315a9a2"
81+
integrity sha512-VQKMkwriZbaOgVCby1UDY/LDk5fIjhQicCvVPFqfe+69fWaPWydbWJ3wRt59/YzIwda1I81loas3oCoHxnqvdA==
8282

8383
8484
version "2.2.8"
@@ -27069,7 +27069,7 @@ sass@^1.49.9:
2706927069
immutable "^4.0.0"
2707027070
source-map-js ">=0.6.2 <2.0.0"
2707127071

27072-
sax@^1.2.4:
27072+
sax@^1.2.4, sax@~1.2.4:
2707327073
version "1.2.4"
2707427074
resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
2707527075
integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
@@ -28513,10 +28513,16 @@ stylus-lookup@^5.0.1:
2851328513
dependencies:
2851428514
commander "^10.0.1"
2851528515

28516-
28517-
version "0.0.1-security"
28518-
resolved "https://registry.yarnpkg.com/stylus/-/stylus-0.0.1-security.tgz#7fbf8df07e6c1202fce29d57fed2ecbf960e6a3b"
28519-
integrity sha512-qTLX5NJwuj5dqdJyi1eAjXGE4HfjWDoPLbSIpYWn/rAEdiyZnsngS/Yj0BRjM7wC41e/+spK4QCXFqz7LM0fFQ==
28516+
[email protected], stylus@^0.59.0:
28517+
version "0.59.0"
28518+
resolved "https://registry.yarnpkg.com/stylus/-/stylus-0.59.0.tgz#a344d5932787142a141946536d6e24e6a6be7aa6"
28519+
integrity sha512-lQ9w/XIOH5ZHVNuNbWW8D822r+/wBSO/d6XvtyHLF7LW4KaCIDeVbvn5DF8fGCJAUCwVhVi/h6J0NUcnylUEjg==
28520+
dependencies:
28521+
"@adobe/css-tools" "^4.0.1"
28522+
debug "^4.3.2"
28523+
glob "^7.1.6"
28524+
sax "~1.2.4"
28525+
source-map "^0.7.3"
2852028526

2852128527
sucrase@^3.27.0, sucrase@^3.35.0, sucrase@getsentry/sucrase#es2020-polyfills:
2852228528
version "3.36.0"

0 commit comments

Comments
 (0)