From 54765c6719ae4af695ad202af0a52e0341cf92e2 Mon Sep 17 00:00:00 2001 From: Krystof Woldrich Date: Tue, 26 Nov 2024 10:43:51 +0100 Subject: [PATCH 1/5] ci: Skip metrics on release branches --- .github/workflows/e2e.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index be710af944..9f8176491c 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -28,7 +28,7 @@ jobs: metrics: runs-on: ${{ matrix.runs-on }} needs: [diff_check, auth_token_check] - if: ${{ needs.diff_check.outputs.skip_ci != 'true' && needs.auth_token_check.outputs.skip_ci != 'true' }} + if: ${{ needs.diff_check.outputs.skip_ci != 'true' && needs.auth_token_check.outputs.skip_ci != 'true' && !startsWith(github.ref, 'refs/heads/release/' ) }} env: SENTRY_DISABLE_AUTO_UPLOAD: 'true' strategy: From 457b10590e5373bce655c2cfcb468b2bc45cabd9 Mon Sep 17 00:00:00 2001 From: Krystof Woldrich Date: Tue, 26 Nov 2024 10:44:14 +0100 Subject: [PATCH 2/5] add kw/ci to test the skip --- .github/workflows/e2e.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 9f8176491c..1bff916178 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -28,7 +28,7 @@ jobs: metrics: runs-on: ${{ matrix.runs-on }} needs: [diff_check, auth_token_check] - if: ${{ needs.diff_check.outputs.skip_ci != 'true' && needs.auth_token_check.outputs.skip_ci != 'true' && !startsWith(github.ref, 'refs/heads/release/' ) }} + if: ${{ needs.diff_check.outputs.skip_ci != 'true' && needs.auth_token_check.outputs.skip_ci != 'true' && !startsWith(github.ref, 'refs/heads/release/') && !startsWith(github.ref, 'refs/heads/kw/ci') }} env: SENTRY_DISABLE_AUTO_UPLOAD: 'true' strategy: From f7581cda51a049faf2bba022c2425f95ece0cecf Mon Sep 17 00:00:00 2001 From: Krystof Woldrich Date: Tue, 26 Nov 2024 10:48:23 +0100 Subject: [PATCH 3/5] test only kw prefix --- .github/workflows/e2e.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 1bff916178..1a66339e03 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -28,7 +28,7 @@ jobs: metrics: runs-on: ${{ matrix.runs-on }} needs: [diff_check, auth_token_check] - if: ${{ needs.diff_check.outputs.skip_ci != 'true' && needs.auth_token_check.outputs.skip_ci != 'true' && !startsWith(github.ref, 'refs/heads/release/') && !startsWith(github.ref, 'refs/heads/kw/ci') }} + if: ${{ needs.diff_check.outputs.skip_ci != 'true' && needs.auth_token_check.outputs.skip_ci != 'true' && !startsWith(github.ref, 'refs/heads/release/') && !startsWith(github.ref, 'refs/heads/kw') }} env: SENTRY_DISABLE_AUTO_UPLOAD: 'true' strategy: From 6b3a2a948b170c6ebb3a0099f73dc7f646e05838 Mon Sep 17 00:00:00 2001 From: Krystof Woldrich Date: Tue, 26 Nov 2024 10:58:16 +0100 Subject: [PATCH 4/5] use git pull n --- .github/workflows/e2e.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index 1a66339e03..f0225e58e4 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -28,7 +28,7 @@ jobs: metrics: runs-on: ${{ matrix.runs-on }} needs: [diff_check, auth_token_check] - if: ${{ needs.diff_check.outputs.skip_ci != 'true' && needs.auth_token_check.outputs.skip_ci != 'true' && !startsWith(github.ref, 'refs/heads/release/') && !startsWith(github.ref, 'refs/heads/kw') }} + if: ${{ needs.diff_check.outputs.skip_ci != 'true' && needs.auth_token_check.outputs.skip_ci != 'true' && !startsWith(github.ref, 'refs/heads/release/') && !startsWith(github.ref, 'refs/pull/4312') }} env: SENTRY_DISABLE_AUTO_UPLOAD: 'true' strategy: From 31aff3333f65287d3b57bf1d3781fd612fd0e032 Mon Sep 17 00:00:00 2001 From: Krystof Woldrich Date: Tue, 26 Nov 2024 11:00:21 +0100 Subject: [PATCH 5/5] remove test conditions --- .github/workflows/e2e.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml index f0225e58e4..1c3cdc1441 100644 --- a/.github/workflows/e2e.yml +++ b/.github/workflows/e2e.yml @@ -28,7 +28,7 @@ jobs: metrics: runs-on: ${{ matrix.runs-on }} needs: [diff_check, auth_token_check] - if: ${{ needs.diff_check.outputs.skip_ci != 'true' && needs.auth_token_check.outputs.skip_ci != 'true' && !startsWith(github.ref, 'refs/heads/release/') && !startsWith(github.ref, 'refs/pull/4312') }} + if: ${{ needs.diff_check.outputs.skip_ci != 'true' && needs.auth_token_check.outputs.skip_ci != 'true' && !startsWith(github.ref, 'refs/heads/release/') }} env: SENTRY_DISABLE_AUTO_UPLOAD: 'true' strategy: