Skip to content

Commit 8931aa8

Browse files
timfishtimfish
committed
Merge branch 'develop' into timfish/test/no-globals
2 parents 20cdf36 + fda7103 commit 8931aa8

File tree

197 files changed

+1892
-1464
lines changed

Some content is hidden

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

197 files changed

+1892
-1464
lines changed

‎.github/ISSUE_TEMPLATE/bug.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -85,9 +85,9 @@ body:
8585
attributes:
8686
label: Reproduction Example/SDK Setup
8787
description:
88-
To ensure that we can help you as fast as possible, please share a link to a reproduction example (GitHub repo or online code editor).
89-
This enables us to quickly understand and address your issue.
90-
If you do not post a link, kindly paste your `Sentry.init` code, so we can see how you set up Sentry.
88+
To ensure that we can help you as fast as possible, please share a link to a reproduction example (GitHub repo
89+
or online code editor). This enables us to quickly understand and address your issue. If you do not post a link,
90+
kindly paste your `Sentry.init` code, so we can see how you set up Sentry.
9191
placeholder: |-
9292
https://some-JS-online-code-editor.com/my-example
9393

‎.github/ISSUE_TEMPLATE/flaky.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ body:
1919
id: job-name
2020
attributes:
2121
label: Name of Job
22-
placeholder: "CI: Build & Test / Nextjs (Node 18) Tests"
22+
placeholder: 'CI: Build & Test / Nextjs (Node 18) Tests'
2323
description: name of job as reported in the status report
2424
validations:
2525
required: true

‎.github/actions/install-dependencies/action.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
name: "Install yarn dependencies"
2-
description: "Installs yarn dependencies and caches them."
1+
name: 'Install yarn dependencies'
2+
description: 'Installs yarn dependencies and caches them.'
33

44
outputs:
55
cache_key:
6-
description: "The dependency cache key"
6+
description: 'The dependency cache key'
77
value: ${{ steps.compute_lockfile_hash.outputs.hash }}
88

99
runs:
10-
using: "composite"
10+
using: 'composite'
1111
steps:
1212
- name: Compute dependency cache key
1313
id: compute_lockfile_hash

‎.github/actions/install-playwright/action.yml‎

Lines changed: 34 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
name: "Install Playwright dependencies"
2-
description: "Installs Playwright dependencies and caches them."
1+
name: 'Install Playwright dependencies'
2+
description: 'Installs Playwright dependencies and caches them.'
33
inputs:
44
browsers:
55
description: 'What browsers to install.'
@@ -9,41 +9,40 @@ inputs:
99
default: '.'
1010

1111
runs:
12-
using: "composite"
12+
using: 'composite'
1313
steps:
14-
- name: Get Playwright version
15-
id: playwright-version
16-
run: echo "version=$(node -p "require('@playwright/test/package.json').version")" >> $GITHUB_OUTPUT
17-
shell: bash
18-
working-directory: ${{ inputs.cwd }}
14+
- name: Get Playwright version
15+
id: playwright-version
16+
run: echo "version=$(node -p "require('@playwright/test/package.json').version")" >> $GITHUB_OUTPUT
17+
shell: bash
18+
working-directory: ${{ inputs.cwd }}
1919

20+
- name: Restore cached playwright binaries
21+
uses: actions/cache/restore@v4
22+
id: playwright-cache
23+
with:
24+
path: |
25+
~/.cache/ms-playwright
26+
key: playwright-${{ runner.os }}-${{ steps.playwright-version.outputs.version }}
2027

21-
- name: Restore cached playwright binaries
22-
uses: actions/cache/restore@v4
23-
id: playwright-cache
24-
with:
25-
path: |
26-
~/.cache/ms-playwright
27-
key: playwright-${{ runner.os }}-${{ steps.playwright-version.outputs.version }}
28+
# We always install all browsers, if uncached
29+
- name: Install Playwright dependencies (uncached)
30+
run: npx playwright install chromium webkit firefox --with-deps
31+
if: steps.playwright-cache.outputs.cache-hit != 'true'
32+
shell: bash
33+
working-directory: ${{ inputs.cwd }}
2834

29-
# We always install all browsers, if uncached
30-
- name: Install Playwright dependencies (uncached)
31-
run: npx playwright install chromium webkit firefox --with-deps
32-
if: steps.playwright-cache.outputs.cache-hit != 'true'
33-
shell: bash
34-
working-directory: ${{ inputs.cwd }}
35+
- name: Install Playwright system dependencies only (cached)
36+
run: npx playwright install-deps ${{ inputs.browsers || 'chromium webkit firefox' }}
37+
if: steps.playwright-cache.outputs.cache-hit == 'true'
38+
shell: bash
39+
working-directory: ${{ inputs.cwd }}
3540

36-
- name: Install Playwright system dependencies only (cached)
37-
run: npx playwright install-deps ${{ inputs.browsers || 'chromium webkit firefox' }}
38-
if: steps.playwright-cache.outputs.cache-hit == 'true'
39-
shell: bash
40-
working-directory: ${{ inputs.cwd }}
41-
42-
# Only store cache on develop branch
43-
- name: Store cached playwright binaries
44-
uses: actions/cache/save@v4
45-
if: github.event_name == 'push' && github.ref == 'refs/heads/develop'
46-
with:
47-
path: |
48-
~/.cache/ms-playwright
49-
key: playwright-${{ runner.os }}-${{ steps.playwright-version.outputs.version }}
41+
# Only store cache on develop branch
42+
- name: Store cached playwright binaries
43+
uses: actions/cache/save@v4
44+
if: github.event_name == 'push' && github.ref == 'refs/heads/develop'
45+
with:
46+
path: |
47+
~/.cache/ms-playwright
48+
key: playwright-${{ runner.os }}-${{ steps.playwright-version.outputs.version }}

‎.github/actions/restore-cache/action.yml‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
1-
name: "Restore dependency & build cache"
2-
description: "Restore the dependency & build cache."
1+
name: 'Restore dependency & build cache'
2+
description: 'Restore the dependency & build cache.'
33

44
inputs:
55
dependency_cache_key:
6-
description: "The dependency cache key"
6+
description: 'The dependency cache key'
77
required: true
88

99
runs:
10-
using: "composite"
10+
using: 'composite'
1111
steps:
12-
- name: Check dependency cache
13-
id: dep-cache
14-
uses: actions/cache/restore@v4
15-
with:
16-
path: ${{ env.CACHED_DEPENDENCY_PATHS }}
17-
key: ${{ inputs.dependency_cache_key }}
12+
- name: Check dependency cache
13+
id: dep-cache
14+
uses: actions/cache/restore@v4
15+
with:
16+
path: ${{ env.CACHED_DEPENDENCY_PATHS }}
17+
key: ${{ inputs.dependency_cache_key }}
1818

19-
- name: Restore build artifacts
20-
uses: actions/download-artifact@v4
21-
with:
22-
name: build-output
19+
- name: Restore build artifacts
20+
uses: actions/download-artifact@v4
21+
with:
22+
name: build-output
2323

24-
- name: Install dependencies
25-
if: steps.dep-cache.outputs.cache-hit != 'true'
26-
run: yarn install --ignore-engines --frozen-lockfile
27-
shell: bash
24+
- name: Install dependencies
25+
if: steps.dep-cache.outputs.cache-hit != 'true'
26+
run: yarn install --ignore-engines --frozen-lockfile
27+
shell: bash

‎.github/dependabot.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ updates:
1313
schedule:
1414
interval: 'weekly'
1515
allow:
16-
- dependency-name: "@sentry/*"
17-
- dependency-name: "@opentelemetry/*"
18-
- dependency-name: "@prisma/instrumentation"
19-
- dependency-name: "opentelemetry-instrumentation-remix"
16+
- dependency-name: '@sentry/*'
17+
- dependency-name: '@opentelemetry/*'
18+
- dependency-name: '@prisma/instrumentation'
19+
- dependency-name: 'opentelemetry-instrumentation-remix'
2020
versioning-strategy: increase
2121
commit-message:
2222
prefix: feat

‎.github/workflows/auto-release.yml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: "Gitflow: Auto prepare release"
1+
name: 'Gitflow: Auto prepare release'
22
on:
33
pull_request:
44
types:
@@ -48,7 +48,9 @@ jobs:
4848

4949
- name: Prepare release
5050
uses: getsentry/action-prepare-release@v1
51-
if: github.event.pull_request.merged == true && steps.version-regex.outputs.match != '' && steps.get_version.outputs.version != ''
51+
if:
52+
github.event.pull_request.merged == true && steps.version-regex.outputs.match != '' &&
53+
steps.get_version.outputs.version != ''
5254
env:
5355
GITHUB_TOKEN: ${{ steps.token.outputs.token }}
5456
with:

‎.github/workflows/build.yml‎

Lines changed: 42 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -99,15 +99,15 @@ jobs:
9999
any_code:
100100
- '!**/*.md'
101101
102-
103102
- name: Get PR labels
104103
id: pr-labels
105104
uses: mydea/pr-labels-action@fn/bump-node20
106105

107106
outputs:
108107
commit_label: '${{ env.COMMIT_SHA }}: ${{ env.COMMIT_MESSAGE }}'
109108
# Note: These next three have to be checked as strings ('true'/'false')!
110-
is_base_branch: ${{ github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/v9' || github.ref == 'refs/heads/v8'}}
109+
is_base_branch:
110+
${{ github.ref == 'refs/heads/develop' || github.ref == 'refs/heads/v9' || github.ref == 'refs/heads/v8'}}
111111
is_release: ${{ startsWith(github.ref, 'refs/heads/release/') }}
112112
changed_ci: ${{ steps.changed.outputs.workflow == 'true' }}
113113
changed_any_code: ${{ steps.changed.outputs.any_code == 'true' }}
@@ -172,7 +172,8 @@ jobs:
172172
key: nx-Linux-${{ github.ref }}-${{ env.HEAD_COMMIT || github.sha }}
173173
# On develop branch, we want to _store_ the cache (so it can be used by other branches), but never _restore_ from it
174174
restore-keys:
175-
${{needs.job_get_metadata.outputs.is_base_branch == 'false' && env.NX_CACHE_RESTORE_KEYS || 'nx-never-restore'}}
175+
${{needs.job_get_metadata.outputs.is_base_branch == 'false' && env.NX_CACHE_RESTORE_KEYS ||
176+
'nx-never-restore'}}
176177

177178
- name: Build packages
178179
# Set the CODECOV_TOKEN for Bundle Analysis
@@ -191,12 +192,24 @@ jobs:
191192

192193
outputs:
193194
dependency_cache_key: ${{ steps.install_dependencies.outputs.cache_key }}
194-
changed_node_integration: ${{ needs.job_get_metadata.outputs.changed_ci == 'true' || contains(steps.checkForAffected.outputs.affected, '@sentry-internal/node-integration-tests') }}
195-
changed_remix: ${{ needs.job_get_metadata.outputs.changed_ci == 'true' || contains(steps.checkForAffected.outputs.affected, '@sentry/remix') }}
196-
changed_node: ${{ needs.job_get_metadata.outputs.changed_ci == 'true' || contains(steps.checkForAffected.outputs.affected, '@sentry/node') }}
197-
changed_deno: ${{ needs.job_get_metadata.outputs.changed_ci == 'true' || contains(steps.checkForAffected.outputs.affected, '@sentry/deno') }}
198-
changed_bun: ${{ needs.job_get_metadata.outputs.changed_ci == 'true' || contains(steps.checkForAffected.outputs.affected, '@sentry/bun') }}
199-
changed_browser_integration: ${{ needs.job_get_metadata.outputs.changed_ci == 'true' || contains(steps.checkForAffected.outputs.affected, '@sentry-internal/browser-integration-tests') }}
195+
changed_node_integration:
196+
${{ needs.job_get_metadata.outputs.changed_ci == 'true' || contains(steps.checkForAffected.outputs.affected,
197+
'@sentry-internal/node-integration-tests') }}
198+
changed_remix:
199+
${{ needs.job_get_metadata.outputs.changed_ci == 'true' || contains(steps.checkForAffected.outputs.affected,
200+
'@sentry/remix') }}
201+
changed_node:
202+
${{ needs.job_get_metadata.outputs.changed_ci == 'true' || contains(steps.checkForAffected.outputs.affected,
203+
'@sentry/node') }}
204+
changed_deno:
205+
${{ needs.job_get_metadata.outputs.changed_ci == 'true' || contains(steps.checkForAffected.outputs.affected,
206+
'@sentry/deno') }}
207+
changed_bun:
208+
${{ needs.job_get_metadata.outputs.changed_ci == 'true' || contains(steps.checkForAffected.outputs.affected,
209+
'@sentry/bun') }}
210+
changed_browser_integration:
211+
${{ needs.job_get_metadata.outputs.changed_ci == 'true' || contains(steps.checkForAffected.outputs.affected,
212+
'@sentry-internal/browser-integration-tests') }}
200213

201214
job_check_branches:
202215
name: Check PR branches
@@ -504,7 +517,9 @@ jobs:
504517
token: ${{ secrets.CODECOV_TOKEN }}
505518

506519
job_browser_playwright_tests:
507-
name: Playwright ${{ matrix.bundle }}${{ matrix.project && matrix.project != 'chromium' && format(' {0}', matrix.project) || ''}}${{ matrix.shard && format(' ({0}/{1})', matrix.shard, matrix.shards) || ''}} Tests
520+
name:
521+
Playwright ${{ matrix.bundle }}${{ matrix.project && matrix.project != 'chromium' && format(' {0}',
522+
matrix.project) || ''}}${{ matrix.shard && format(' ({0}/{1})', matrix.shard, matrix.shards) || ''}} Tests
508523
needs: [job_get_metadata, job_build]
509524
if: needs.job_build.outputs.changed_browser_integration == 'true' || github.event_name != 'pull_request'
510525
runs-on: ubuntu-20.04-large-js
@@ -574,13 +589,17 @@ jobs:
574589
env:
575590
PW_BUNDLE: ${{ matrix.bundle }}
576591
working-directory: dev-packages/browser-integration-tests
577-
run: yarn test:all${{ matrix.project && format(' --project={0}', matrix.project) || '' }}${{ matrix.shard && format(' --shard={0}/{1}', matrix.shard, matrix.shards) || '' }}
592+
run:
593+
yarn test:all${{ matrix.project && format(' --project={0}', matrix.project) || '' }}${{ matrix.shard &&
594+
format(' --shard={0}/{1}', matrix.shard, matrix.shards) || '' }}
578595

579596
- name: Upload Playwright Traces
580597
uses: actions/upload-artifact@v4
581598
if: failure()
582599
with:
583-
name: playwright-traces-job_browser_playwright_tests-${{ matrix.bundle}}-${{matrix.project}}-${{matrix.shard || '0'}}
600+
name:
601+
playwright-traces-job_browser_playwright_tests-${{ matrix.bundle}}-${{matrix.project}}-${{matrix.shard ||
602+
'0'}}
584603
path: dev-packages/browser-integration-tests/test-results
585604
overwrite: true
586605
retention-days: 7
@@ -822,19 +841,24 @@ jobs:
822841

823842
- name: Determine which E2E test applications should be run
824843
id: matrix
825-
run: yarn --silent ci:build-matrix --base=${{ (github.event_name == 'pull_request' && github.event.pull_request.base.sha) || '' }} >> $GITHUB_OUTPUT
844+
run:
845+
yarn --silent ci:build-matrix --base=${{ (github.event_name == 'pull_request' &&
846+
github.event.pull_request.base.sha) || '' }} >> $GITHUB_OUTPUT
826847
working-directory: dev-packages/e2e-tests
827848

828849
- name: Determine which optional E2E test applications should be run
829850
id: matrix-optional
830-
run: yarn --silent ci:build-matrix-optional --base=${{ (github.event_name == 'pull_request' && github.event.pull_request.base.sha) || '' }} >> $GITHUB_OUTPUT
851+
run:
852+
yarn --silent ci:build-matrix-optional --base=${{ (github.event_name == 'pull_request' &&
853+
github.event.pull_request.base.sha) || '' }} >> $GITHUB_OUTPUT
831854
working-directory: dev-packages/e2e-tests
832855

833856
job_e2e_tests:
834857
name: E2E ${{ matrix.label || matrix.test-application }} Test
835858
# We need to add the `always()` check here because the previous step has this as well :(
836859
# See: https://github.com/actions/runner/issues/2205
837-
if: always() && needs.job_e2e_prepare.result == 'success' && needs.job_e2e_prepare.outputs.matrix != '{"include":[]}'
860+
if:
861+
always() && needs.job_e2e_prepare.result == 'success' && needs.job_e2e_prepare.outputs.matrix != '{"include":[]}'
838862
needs: [job_get_metadata, job_build, job_e2e_prepare]
839863
runs-on: ubuntu-22.04
840864
timeout-minutes: 15
@@ -951,12 +975,9 @@ jobs:
951975
# We need to add the `always()` check here because the previous step has this as well :(
952976
# See: https://github.com/actions/runner/issues/2205
953977
if:
954-
always() &&
955-
needs.job_get_metadata.outputs.is_release != 'true' &&
956-
needs.job_e2e_prepare.result == 'success' &&
957-
needs.job_e2e_prepare.outputs.matrix-optional != '{"include":[]}' &&
958-
(github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository) &&
959-
github.actor != 'dependabot[bot]'
978+
always() && needs.job_get_metadata.outputs.is_release != 'true' && needs.job_e2e_prepare.result == 'success' &&
979+
needs.job_e2e_prepare.outputs.matrix-optional != '{"include":[]}' && (github.event_name != 'pull_request' ||
980+
github.event.pull_request.head.repo.full_name == github.repository) && github.actor != 'dependabot[bot]'
960981
needs: [job_get_metadata, job_build, job_e2e_prepare]
961982
runs-on: ubuntu-20.04
962983
timeout-minutes: 15

‎.github/workflows/cleanup-pr-caches.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: "Automation: Cleanup PR caches"
1+
name: 'Automation: Cleanup PR caches'
22
on:
33
pull_request:
44
types:

‎.github/workflows/clear-cache.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: "Action: Clear all GHA caches"
1+
name: 'Action: Clear all GHA caches'
22
on:
33
workflow_dispatch:
44
inputs:

0 commit comments

Comments
 (0)