Skip to content

Commit f1f9bd4

Browse files
committed
build: revert changes to build.yml
1 parent cf53b90 commit f1f9bd4

File tree

1 file changed

+23
-40
lines changed

1 file changed

+23
-40
lines changed

.github/workflows/build.yml

+23-40
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:
@@ -540,9 +529,7 @@ jobs:
540529
run: yarn lerna run test --scope @sentry/profiling-node
541530

542531
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
532+
name: Playwright ${{ matrix.bundle }}${{ matrix.project && matrix.project != 'chromium' && format(' {0}', matrix.project) || ''}}${{ matrix.shard && format(' ({0}/{1})', matrix.shard, matrix.shards) || ''}} Tests
546533
needs: [job_get_metadata, job_build]
547534
if: needs.job_build.outputs.changed_browser_integration == 'true' || github.event_name != 'pull_request'
548535
runs-on: ubuntu-20.04-large-js
@@ -612,17 +599,13 @@ jobs:
612599
env:
613600
PW_BUNDLE: ${{ matrix.bundle }}
614601
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) || '' }}
602+
run: yarn test:ci${{ matrix.project && format(' --project={0}', matrix.project) || '' }}${{ matrix.shard && format(' --shard={0}/{1}', matrix.shard, matrix.shards) || '' }}
618603

619604
- name: Upload Playwright Traces
620605
uses: actions/upload-artifact@v4
621606
if: failure()
622607
with:
623-
name:
624-
playwright-traces-job_browser_playwright_tests-${{ matrix.bundle}}-${{matrix.project}}-${{matrix.shard ||
625-
'0'}}
608+
name: playwright-traces-job_browser_playwright_tests-${{ matrix.bundle}}-${{matrix.project}}-${{matrix.shard || '0'}}
626609
path: dev-packages/browser-integration-tests/test-results
627610
overwrite: true
628611
retention-days: 7
@@ -933,7 +916,7 @@ jobs:
933916
'nuxt-3',
934917
'vue-3',
935918
'webpack-4',
936-
'webpack-5',
919+
'webpack-5'
937920
]
938921
build-command:
939922
- false
@@ -1036,8 +1019,9 @@ jobs:
10361019
# We need to add the `always()` check here because the previous step has this as well :(
10371020
# See: https://github.com/actions/runner/issues/2205
10381021
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]'
1022+
always() && needs.job_e2e_prepare.result == 'success' &&
1023+
(github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository) &&
1024+
github.actor != 'dependabot[bot]'
10411025
needs: [job_get_metadata, job_build, job_e2e_prepare]
10421026
runs-on: ubuntu-20.04
10431027
timeout-minutes: 10
@@ -1151,10 +1135,12 @@ jobs:
11511135
# See: https://github.com/actions/runner/issues/2205
11521136
if:
11531137
# 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') )
1138+
always() && needs.job_e2e_prepare.result == 'success' &&
1139+
(github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository) &&
1140+
(
1141+
(needs.job_get_metadata.outputs.changed_profiling_node == 'true') ||
1142+
(needs.job_get_metadata.outputs.is_release == 'true')
1143+
)
11581144
needs: [job_get_metadata, job_build, job_e2e_prepare]
11591145
runs-on: ubuntu-20.04
11601146
timeout-minutes: 10
@@ -1311,10 +1297,7 @@ jobs:
13111297
retention-days: 7
13121298

13131299
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' }}
1300+
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' }}
13181301
needs: [job_get_metadata, job_build]
13191302
# Compiling bindings can be very slow (especially on windows), so only run precompile
13201303
# Skip precompile unless we are on a release branch as precompile slows down CI times.
@@ -1328,7 +1311,7 @@ jobs:
13281311
fail-fast: false
13291312
matrix:
13301313
include:
1331-
# x64 glibc
1314+
# x64 glibc
13321315
- os: ubuntu-20.04
13331316
node: 16
13341317
binary: linux-x64-glibc-93
@@ -1485,7 +1468,7 @@ jobs:
14851468

14861469
- name: Install dependencies
14871470
env:
1488-
SKIP_PLAYWRIGHT_BROWSER_INSTALL: '1'
1471+
SKIP_PLAYWRIGHT_BROWSER_INSTALL: "1"
14891472
if: steps.restore-dependencies.outputs.cache-hit != 'true'
14901473
run: yarn install --ignore-engines --frozen-lockfile
14911474

0 commit comments

Comments
 (0)