From 67df47b58e14b0adea47a4be6c66add0ee19a161 Mon Sep 17 00:00:00 2001 From: Scott Gerring Date: Wed, 19 Mar 2025 16:03:47 +0100 Subject: [PATCH 1/6] Need to filter push events for main --- .github/workflows/benchmark.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index 40d59c510e..66999d8427 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -25,8 +25,8 @@ jobs: runs-on: ${{ github.event_name == 'pull_request' && 'ubuntu-latest' || 'self-hosted' }} if: | ${{ - github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'performance') || - github.event_name == 'push' + (github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'performance')) || + (github.event_name == 'push' && github.ref == 'refs/heads/main') }} env: # For PRs, compare against the base branch - e.g., 'main'. From bb677f52b7ebffc26e9a17dccb2fa02cc4bedd31 Mon Sep 17 00:00:00 2001 From: Scott Gerring Date: Wed, 19 Mar 2025 16:06:52 +0100 Subject: [PATCH 2/6] this? --- .github/workflows/benchmark.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index 66999d8427..3570e2ae48 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -25,8 +25,7 @@ jobs: runs-on: ${{ github.event_name == 'pull_request' && 'ubuntu-latest' || 'self-hosted' }} if: | ${{ - (github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'performance')) || - (github.event_name == 'push' && github.ref == 'refs/heads/main') + (github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'performance')) }} env: # For PRs, compare against the base branch - e.g., 'main'. From f342bf78e5d06ccf5ab8669e2b2c4650b02d6931 Mon Sep 17 00:00:00 2001 From: Scott Gerring Date: Wed, 19 Mar 2025 16:08:53 +0100 Subject: [PATCH 3/6] restore entire old check --- .github/workflows/benchmark.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index 3570e2ae48..09fef32709 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -23,10 +23,7 @@ jobs: # runners on arbitrary PRs, and we don't want to unleash that load on the pool anyway. # If we're running on main, use the OTEL self-hosted runner pool. runs-on: ${{ github.event_name == 'pull_request' && 'ubuntu-latest' || 'self-hosted' }} - if: | - ${{ - (github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'performance')) - }} + if: ${{ contains(github.event.pull_request.labels.*.name, 'performance') }} env: # For PRs, compare against the base branch - e.g., 'main'. # For pushes to main, compare against the previous commit From 45bacaced8131e54929a19d5547a0107b948347d Mon Sep 17 00:00:00 2001 From: Scott Gerring Date: Wed, 19 Mar 2025 16:10:23 +0100 Subject: [PATCH 4/6] . --- .github/workflows/benchmark.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index 09fef32709..538232e497 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -23,7 +23,7 @@ jobs: # runners on arbitrary PRs, and we don't want to unleash that load on the pool anyway. # If we're running on main, use the OTEL self-hosted runner pool. runs-on: ${{ github.event_name == 'pull_request' && 'ubuntu-latest' || 'self-hosted' }} - if: ${{ contains(github.event.pull_request.labels.*.name, 'performance') }} + if: ${{ github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'performance') }} env: # For PRs, compare against the base branch - e.g., 'main'. # For pushes to main, compare against the previous commit From 404184442779344096e89cb5b719aa80df363b7a Mon Sep 17 00:00:00 2001 From: Scott Gerring Date: Wed, 19 Mar 2025 16:11:08 +0100 Subject: [PATCH 5/6] . --- .github/workflows/benchmark.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index 538232e497..85d9307128 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -23,7 +23,7 @@ jobs: # runners on arbitrary PRs, and we don't want to unleash that load on the pool anyway. # If we're running on main, use the OTEL self-hosted runner pool. runs-on: ${{ github.event_name == 'pull_request' && 'ubuntu-latest' || 'self-hosted' }} - if: ${{ github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'performance') }} + if: ${{ (github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'performance')) }} env: # For PRs, compare against the base branch - e.g., 'main'. # For pushes to main, compare against the previous commit From f09bbc43f9d0452932453092d227bafa00fc0446 Mon Sep 17 00:00:00 2001 From: Scott Gerring Date: Wed, 19 Mar 2025 16:11:59 +0100 Subject: [PATCH 6/6] . --- .github/workflows/benchmark.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index 85d9307128..1c5b5aac7c 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -23,7 +23,7 @@ jobs: # runners on arbitrary PRs, and we don't want to unleash that load on the pool anyway. # If we're running on main, use the OTEL self-hosted runner pool. runs-on: ${{ github.event_name == 'pull_request' && 'ubuntu-latest' || 'self-hosted' }} - if: ${{ (github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'performance')) }} + if: ${{ (github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'performance')) || github.event_name == 'push' }} env: # For PRs, compare against the base branch - e.g., 'main'. # For pushes to main, compare against the previous commit