From aa46c7e5696f2461b79b4bfb2506a775e3245991 Mon Sep 17 00:00:00 2001 From: Francesco Novy Date: Tue, 6 Feb 2024 10:55:56 +0100 Subject: [PATCH 1/2] build(ci): Ensure we run E2E tests when profiling node is skipped --- .github/workflows/build.yml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 15731e43689f..2a06f8c76954 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -952,7 +952,13 @@ jobs: job_e2e_prepare: name: Prepare E2E tests - if: + # We want to run this if: + # - The build job was successful, not skipped + # - AND if the profiling node bindings were either successful or skipped + # AND if this is not a PR from a fork or dependabot + if: | + always() && needs.job_build.result == 'success' && + (needs.job_compile_bindings_profiling_node.result == 'success' || needs.job_compile_bindings_profiling_node.result == 'skipped') && (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository) && github.actor != 'dependabot[bot]' needs: [job_get_metadata, job_build, job_compile_bindings_profiling_node] @@ -1014,7 +1020,10 @@ jobs: name: E2E ${{ matrix.label || matrix.test-application }} Test # 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 # Dependabot PRs sadly also don't have access to secrets, so we skip them as well + # We need to add the `always()` check here because the previous step has this as well :( + # See: https://github.com/actions/runner/issues/2205 if: + always() && needs.job_e2e_prepare.result == 'success' && (github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name == github.repository) && github.actor != 'dependabot[bot]' needs: [job_get_metadata, job_build, job_e2e_prepare] From 5c66803e5a6a5ec47a3e8b0acb0f7cf6d7e3d8c2 Mon Sep 17 00:00:00 2001 From: Francesco Novy Date: Tue, 6 Feb 2024 11:54:02 +0100 Subject: [PATCH 2/2] fix test --- .../e2e-tests/test-applications/vue-3/tests/performance.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-packages/e2e-tests/test-applications/vue-3/tests/performance.test.ts b/dev-packages/e2e-tests/test-applications/vue-3/tests/performance.test.ts index 2210c92e5dfd..dc5bd500eee3 100644 --- a/dev-packages/e2e-tests/test-applications/vue-3/tests/performance.test.ts +++ b/dev-packages/e2e-tests/test-applications/vue-3/tests/performance.test.ts @@ -53,7 +53,7 @@ test('sends a navigation transaction with a parameterized URL', async ({ page }) 'sentry.source': 'route', 'sentry.origin': 'auto.navigation.vue', 'sentry.op': 'navigation', - 'params.id': '456', + 'params.id': '123', }, op: 'navigation', origin: 'auto.navigation.vue',