Skip to content

Commit 931b6a6

Browse files
authored
Merge branch 'v8' into timfish/feat/anr-multiple-events
2 parents 7c7c45a + 85952db commit 931b6a6

File tree

52 files changed

+153
-154
lines changed

Some content is hidden

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

52 files changed

+153
-154
lines changed

.craft.yml

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,6 @@ targets:
142142
id: '@sentry-internal/eslint-config-sdk'
143143
includeNames: /^sentry-internal-eslint-config-sdk-\d.*\.tgz$/
144144

145-
# TODO(v9): Remove this target
146145
# NOTE: We publish the v8 layer under its own name so people on v8 can still get patches
147146
# whenever we release a new v8 version—otherwise we would overwrite the current major lambda layer.
148147
- name: aws-lambda-layer
@@ -159,21 +158,6 @@ targets:
159158
- nodejs20.x
160159
license: MIT
161160

162-
# AWS Lambda Layer target
163-
- name: aws-lambda-layer
164-
includeNames: /^sentry-node-serverless-\d+.\d+.\d+(-(beta|alpha|rc)\.\d+)?\.zip$/
165-
layerName: SentryNodeServerlessSDK
166-
compatibleRuntimes:
167-
- name: node
168-
versions:
169-
- nodejs10.x
170-
- nodejs12.x
171-
- nodejs14.x
172-
- nodejs16.x
173-
- nodejs18.x
174-
- nodejs20.x
175-
license: MIT
176-
177161
# CDN Bundle Target
178162
- name: gcs
179163
id: 'browser-cdn-bundles'

.github/workflows/build.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ on:
44
branches:
55
- develop
66
- master
7+
- v9
8+
- v8
79
- release/**
810
pull_request:
911
merge_group:
@@ -105,7 +107,7 @@ jobs:
105107
outputs:
106108
commit_label: '${{ env.COMMIT_SHA }}: ${{ env.COMMIT_MESSAGE }}'
107109
# Note: These next three have to be checked as strings ('true'/'false')!
108-
is_develop: ${{ github.ref == 'refs/heads/develop' }}
110+
is_base_branch: ${{ github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/v9' || github.ref == 'refs/heads/v8'}}
109111
is_release: ${{ startsWith(github.ref, 'refs/heads/release/') }}
110112
changed_profiling_node: ${{ steps.changed.outputs.profiling_node == 'true' }}
111113
changed_ci: ${{ steps.changed.outputs.workflow == 'true' }}
@@ -126,7 +128,7 @@ jobs:
126128
timeout-minutes: 15
127129
if: |
128130
needs.job_get_metadata.outputs.changed_any_code == 'true' ||
129-
needs.job_get_metadata.outputs.is_develop == 'true' ||
131+
needs.job_get_metadata.outputs.is_base_branch == 'true' ||
130132
needs.job_get_metadata.outputs.is_release == 'true' ||
131133
(needs.job_get_metadata.outputs.is_gitflow_sync == 'false' && needs.job_get_metadata.outputs.has_gitflow_label == 'false')
132134
steps:
@@ -171,7 +173,7 @@ jobs:
171173
key: nx-Linux-${{ github.ref }}-${{ env.HEAD_COMMIT || github.sha }}
172174
# On develop branch, we want to _store_ the cache (so it can be used by other branches), but never _restore_ from it
173175
restore-keys:
174-
${{needs.job_get_metadata.outputs.is_develop == 'false' && env.NX_CACHE_RESTORE_KEYS || 'nx-never-restore'}}
176+
${{needs.job_get_metadata.outputs.is_base_branch == 'false' && env.NX_CACHE_RESTORE_KEYS || 'nx-never-restore'}}
175177

176178
- name: Build packages
177179
# Set the CODECOV_TOKEN for Bundle Analysis
@@ -219,7 +221,7 @@ jobs:
219221
timeout-minutes: 15
220222
runs-on: ubuntu-20.04
221223
if:
222-
github.event_name == 'pull_request' || needs.job_get_metadata.outputs.is_develop == 'true' ||
224+
github.event_name == 'pull_request' || needs.job_get_metadata.outputs.is_base_branch == 'true' ||
223225
needs.job_get_metadata.outputs.is_release == 'true'
224226
steps:
225227
- name: Check out current commit (${{ needs.job_get_metadata.outputs.commit_label }})

.github/workflows/enforce-license-compliance.yml

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,18 @@ name: "CI: Enforce License Compliance"
22

33
on:
44
push:
5-
branches: [master, develop, release/*]
5+
branches:
6+
- develop
7+
- master
8+
- v9
9+
- v8
10+
- release/**
611
pull_request:
7-
branches: [master, develop]
12+
branches:
13+
- develop
14+
- master
15+
- v9
16+
- v8
817

918
jobs:
1019
enforce-license-compliance:

CHANGELOG.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@
1010

1111
- "You miss 100 percent of the chances you don't take. — Wayne Gretzky" — Michael Scott
1212

13+
## 8.45.1
14+
15+
- fix(feedback): Return when the `sendFeedback` promise resolves ([#14683](https://github.com/getsentry/sentry-javascript/pull/14683))
16+
1317
## 8.45.0
1418

1519
- feat(core): Add `handled` option to `captureConsoleIntegration` ([#14664](https://github.com/getsentry/sentry-javascript/pull/14664))

dev-packages/browser-integration-tests/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry-internal/browser-integration-tests",
3-
"version": "8.45.0",
3+
"version": "8.45.1",
44
"main": "index.js",
55
"license": "MIT",
66
"engines": {
@@ -43,7 +43,7 @@
4343
"@babel/preset-typescript": "^7.16.7",
4444
"@playwright/test": "^1.44.1",
4545
"@sentry-internal/rrweb": "2.31.0",
46-
"@sentry/browser": "8.45.0",
46+
"@sentry/browser": "8.45.1",
4747
"axios": "1.7.7",
4848
"babel-loader": "^8.2.2",
4949
"html-webpack-plugin": "^5.5.0",

dev-packages/bundle-analyzer-scenarios/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry-internal/bundle-analyzer-scenarios",
3-
"version": "8.45.0",
3+
"version": "8.45.1",
44
"description": "Scenarios to test bundle analysis with",
55
"repository": "git://github.com/getsentry/sentry-javascript.git",
66
"homepage": "https://github.com/getsentry/sentry-javascript/tree/master/dev-packages/bundle-analyzer-scenarios",

dev-packages/clear-cache-gh-action/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@sentry-internal/clear-cache-gh-action",
33
"description": "An internal Github Action to clear GitHub caches.",
4-
"version": "8.45.0",
4+
"version": "8.45.1",
55
"license": "MIT",
66
"engines": {
77
"node": ">=18"

dev-packages/e2e-tests/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry-internal/e2e-tests",
3-
"version": "8.45.0",
3+
"version": "8.45.1",
44
"license": "MIT",
55
"private": true,
66
"scripts": {

dev-packages/external-contributor-gh-action/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@sentry-internal/external-contributor-gh-action",
33
"description": "An internal Github Action to add external contributors to the CHANGELOG.md file.",
4-
"version": "8.45.0",
4+
"version": "8.45.1",
55
"license": "MIT",
66
"engines": {
77
"node": ">=18"

dev-packages/node-integration-tests/package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@sentry-internal/node-integration-tests",
3-
"version": "8.45.0",
3+
"version": "8.45.1",
44
"license": "MIT",
55
"engines": {
66
"node": ">=14.18"
@@ -31,9 +31,9 @@
3131
"@nestjs/core": "10.4.6",
3232
"@nestjs/platform-express": "10.4.6",
3333
"@prisma/client": "5.9.1",
34-
"@sentry/aws-serverless": "8.45.0",
35-
"@sentry/core": "8.45.0",
36-
"@sentry/node": "8.45.0",
34+
"@sentry/aws-serverless": "8.45.1",
35+
"@sentry/core": "8.45.1",
36+
"@sentry/node": "8.45.1",
3737
"@types/mongodb": "^3.6.20",
3838
"@types/mysql": "^2.15.21",
3939
"@types/pg": "^8.6.5",

0 commit comments

Comments
 (0)