Skip to content

Commit 96bdbdf

Browse files
JonasBaJonasBa
committed
build: revert changes to build.yml
1 parent cf53b90 commit 96bdbdf

File tree

1 file changed

+28
-57
lines changed

1 file changed

+28
-57
lines changed

‎.github/workflows/build.yml

Lines changed: 28 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ jobs:
9898
any_code:
9999
- '!**/*.md'
100100
101+
101102
- name: Get PR labels
102103
id: pr-labels
103104
uses: mydea/pr-labels-action@fn/bump-node20
@@ -190,24 +191,12 @@ jobs:
190191

191192
outputs:
192193
dependency_cache_key: ${{ steps.install_dependencies.outputs.cache_key }}
193-
changed_node_integration:
194-
${{ needs.job_get_metadata.outputs.changed_ci == 'true' || contains(steps.checkForAffected.outputs.affected,
195-
'@sentry-internal/node-integration-tests') }}
196-
changed_remix:
197-
${{ needs.job_get_metadata.outputs.changed_ci == 'true' || contains(steps.checkForAffected.outputs.affected,
198-
'@sentry/remix') }}
199-
changed_node:
200-
${{ needs.job_get_metadata.outputs.changed_ci == 'true' || contains(steps.checkForAffected.outputs.affected,
201-
'@sentry/node') }}
202-
changed_deno:
203-
${{ needs.job_get_metadata.outputs.changed_ci == 'true' || contains(steps.checkForAffected.outputs.affected,
204-
'@sentry/deno') }}
205-
changed_bun:
206-
${{ needs.job_get_metadata.outputs.changed_ci == 'true' || contains(steps.checkForAffected.outputs.affected,
207-
'@sentry/bun') }}
208-
changed_browser_integration:
209-
${{ needs.job_get_metadata.outputs.changed_ci == 'true' || contains(steps.checkForAffected.outputs.affected,
210-
'@sentry-internal/browser-integration-tests') }}
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') }}
211200
# If you are looking for changed_profiling_node, this is defined in job_get_metadata
212201

213202
job_check_branches:
@@ -448,7 +437,7 @@ jobs:
448437
with:
449438
node-version-file: 'package.json'
450439
- name: Set up Deno
451-
uses: denoland/setup-deno@v1.4.1
440+
uses: denoland/setup-deno@v1.1.4
452441
with:
453442
deno-version: v1.38.5
454443
- name: Restore caches
@@ -511,10 +500,7 @@ jobs:
511500
job_profiling_node_unit_tests:
512501
name: Node Profiling Unit Tests
513502
needs: [job_get_metadata, job_build]
514-
if: |
515-
needs.job_build.outputs.changed_node == 'true' ||
516-
needs.job_get_metadata.outputs.changed_profiling_node == 'true' ||
517-
github.event_name != 'pull_request'
503+
if: needs.job_build.outputs.changed_node == 'true' || needs.job_get_metadata.outputs.changed_profiling_node == 'true' || github.event_name != 'pull_request'
518504
runs-on: ubuntu-latest
519505
timeout-minutes: 10
520506
steps:
@@ -540,9 +526,7 @@ jobs:
540526
run: yarn lerna run test --scope @sentry/profiling-node
541527

542528
job_browser_playwright_tests:
543-
name:
544-
Playwright ${{ matrix.bundle }}${{ matrix.project && matrix.project != 'chromium' && format(' {0}',
545-
matrix.project) || ''}}${{ matrix.shard && format(' ({0}/{1})', matrix.shard, matrix.shards) || ''}} Tests
529+
name: Playwright ${{ matrix.bundle }}${{ matrix.project && matrix.project != 'chromium' && format(' {0}', matrix.project) || ''}}${{ matrix.shard && format(' ({0}/{1})', matrix.shard, matrix.shards) || ''}} Tests
546530
needs: [job_get_metadata, job_build]
547531
if: needs.job_build.outputs.changed_browser_integration == 'true' || github.event_name != 'pull_request'
548532
runs-on: ubuntu-20.04-large-js
@@ -612,17 +596,13 @@ jobs:
612596
env:
613597
PW_BUNDLE: ${{ matrix.bundle }}
614598
working-directory: dev-packages/browser-integration-tests
615-
run:
616-
yarn test:ci${{ matrix.project && format(' --project={0}', matrix.project) || '' }}${{ matrix.shard &&
617-
format(' --shard={0}/{1}', matrix.shard, matrix.shards) || '' }}
599+
run: yarn test:ci${{ matrix.project && format(' --project={0}', matrix.project) || '' }}${{ matrix.shard && format(' --shard={0}/{1}', matrix.shard, matrix.shards) || '' }}
618600

619601
- name: Upload Playwright Traces
620602
uses: actions/upload-artifact@v4
621603
if: failure()
622604
with:
623-
name:
624-
playwright-traces-job_browser_playwright_tests-${{ matrix.bundle}}-${{matrix.project}}-${{matrix.shard ||
625-
'0'}}
605+
name: playwright-traces-job_browser_playwright_tests-${{ matrix.bundle}}-${{matrix.project}}-${{matrix.shard || '0'}}
626606
path: dev-packages/browser-integration-tests/test-results
627607
overwrite: true
628608
retention-days: 7
@@ -925,15 +905,13 @@ jobs:
925905
'nestjs-basic',
926906
'nestjs-distributed-tracing',
927907
'nestjs-with-submodules',
928-
'nestjs-with-submodules-decorator',
929-
'nestjs-graphql',
930908
'node-exports-test-app',
931909
'node-koa',
932910
'node-connect',
933911
'nuxt-3',
934912
'vue-3',
935913
'webpack-4',
936-
'webpack-5',
914+
'webpack-5'
937915
]
938916
build-command:
939917
- false
@@ -1021,23 +999,15 @@ jobs:
1021999
timeout-minutes: 5
10221000
run: pnpm test:assert
10231001

1024-
- name: Upload Playwright Traces
1025-
uses: actions/upload-artifact@v4
1026-
if: failure()
1027-
with:
1028-
name: playwright-traces-job_e2e_playwright_tests-${{ matrix.test-application}}
1029-
path: dev-packages/e2e-tests/test-applications/${{ matrix.test-application}}/test-results
1030-
overwrite: true
1031-
retention-days: 7
1032-
10331002
job_optional_e2e_tests:
10341003
name: E2E ${{ matrix.label || matrix.test-application }} Test
10351004
# We only run E2E tests for non-fork PRs because the E2E tests require secrets to work and they can't be accessed from forks
10361005
# We need to add the `always()` check here because the previous step has this as well :(
10371006
# See: https://github.com/actions/runner/issues/2205
10381007
if:
1039-
always() && needs.job_e2e_prepare.result == 'success' && (github.event_name != 'pull_request' ||
1040-
github.event.pull_request.head.repo.full_name == github.repository) && github.actor != 'dependabot[bot]'
1008+
always() && needs.job_e2e_prepare.result == 'success' &&
1009+
(github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository) &&
1010+
github.actor != 'dependabot[bot]'
10411011
needs: [job_get_metadata, job_build, job_e2e_prepare]
10421012
runs-on: ubuntu-20.04
10431013
timeout-minutes: 10
@@ -1151,10 +1121,13 @@ jobs:
11511121
# See: https://github.com/actions/runner/issues/2205
11521122
if:
11531123
# Only run profiling e2e tests if profiling node bindings have changed
1154-
always() && needs.job_e2e_prepare.result == 'success' && (github.event_name != 'pull_request' ||
1155-
github.event.pull_request.head.repo.full_name == github.repository) && (
1156-
(needs.job_get_metadata.outputs.changed_profiling_node == 'true') || (needs.job_get_metadata.outputs.is_release ==
1157-
'true') )
1124+
always() && needs.job_e2e_prepare.result == 'success' &&
1125+
(github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository) &&
1126+
(
1127+
(needs.job_get_metadata.outputs.changed_profiling_node == 'true') ||
1128+
(needs.job_get_metadata.outputs.is_release == 'true') ||
1129+
(github.event_name != 'pull_request')
1130+
)
11581131
needs: [job_get_metadata, job_build, job_e2e_prepare]
11591132
runs-on: ubuntu-20.04
11601133
timeout-minutes: 10
@@ -1311,24 +1284,22 @@ jobs:
13111284
retention-days: 7
13121285

13131286
job_compile_bindings_profiling_node:
1314-
name:
1315-
Compile & Test Profiling Bindings (v${{ matrix.node }}) ${{ matrix.target_platform || matrix.os }}, ${{
1316-
matrix.node || matrix.container }}, ${{ matrix.arch || matrix.container }}, ${{ contains(matrix.container,
1317-
'alpine') && 'musl' || 'glibc' }}
1287+
name: Compile & Test Profiling Bindings (v${{ matrix.node }}) ${{ matrix.target_platform || matrix.os }}, ${{ matrix.node || matrix.container }}, ${{ matrix.arch || matrix.container }}, ${{ contains(matrix.container, 'alpine') && 'musl' || 'glibc' }}
13181288
needs: [job_get_metadata, job_build]
13191289
# Compiling bindings can be very slow (especially on windows), so only run precompile
13201290
# Skip precompile unless we are on a release branch as precompile slows down CI times.
13211291
if: |
13221292
(needs.job_get_metadata.outputs.changed_profiling_node == 'true') ||
1323-
(needs.job_get_metadata.outputs.is_release == 'true')
1293+
(needs.job_get_metadata.outputs.is_release == 'true') ||
1294+
(github.event_name != 'pull_request')
13241295
runs-on: ${{ matrix.os }}
13251296
container: ${{ matrix.container }}
13261297
timeout-minutes: 30
13271298
strategy:
13281299
fail-fast: false
13291300
matrix:
13301301
include:
1331-
# x64 glibc
1302+
# x64 glibc
13321303
- os: ubuntu-20.04
13331304
node: 16
13341305
binary: linux-x64-glibc-93
@@ -1485,7 +1456,7 @@ jobs:
14851456

14861457
- name: Install dependencies
14871458
env:
1488-
SKIP_PLAYWRIGHT_BROWSER_INSTALL: '1'
1459+
SKIP_PLAYWRIGHT_BROWSER_INSTALL: "1"
14891460
if: steps.restore-dependencies.outputs.cache-hit != 'true'
14901461
run: yarn install --ignore-engines --frozen-lockfile
14911462

0 commit comments

Comments
 (0)