From 40d89226b5e06572ebbb4a465eb68ecd4c070d2e Mon Sep 17 00:00:00 2001 From: Polyglot AI <293096396+polyglotAI-bot@users.noreply.github.com> Date: Sat, 21 Nov 2026 00:48:08 +0000 Subject: [PATCH] Add a tests:run-core-sql label that runs the upstream SQL tests on a pull request upstream-sql-tests.yml runs nightly, manually, and on pull requests that change the harness or the workflow. A pull request that changes only the client does not start it. - upstream-sql-tests-label.yml starts on a pull_request `labeled` event. When the label is tests:run-core-sql, it calls upstream-sql-tests.yml and then removes the label. A second workflow is necessary because the `paths` filter of the pull_request trigger also applies to a `labeled` event. - upstream-sql-tests.yml gets a workflow_call trigger. Nothing else changes. - The trigger is pull_request, not pull_request_target: the tests need no secrets, and the code of a fork runs with a read-only token. That token cannot remove the label, so the remove-label job skips forks. - The README (CI) documents the label. Co-Authored-By: Claude Opus 5.5 --- .../workflows/upstream-sql-tests-label.yml | 45 +++++++++++++++++++ .github/workflows/upstream-sql-tests.yml | 4 ++ tests/clickhouse-test-runner/README.md | 8 ++++ 3 files changed, 57 insertions(+) create mode 100644 .github/workflows/upstream-sql-tests-label.yml diff --git a/.github/workflows/upstream-sql-tests-label.yml b/.github/workflows/upstream-sql-tests-label.yml new file mode 100644 index 00000000..e093c6d7 --- /dev/null +++ b/.github/workflows/upstream-sql-tests-label.yml @@ -0,0 +1,45 @@ +name: Upstream SQL tests by label + +# Runs upstream-sql-tests.yml on a pull request when a maintainer adds the +# tests:run-core-sql label. Use it for a pull request that does not start that +# workflow itself, for example a change in the client. The run removes the +# label when it ends, so to run the tests again, add the label again. +on: + # Not pull_request_target: the tests need no secrets, and pull_request runs + # the code of a fork with a read-only token. The `paths` filter of the + # pull_request trigger in upstream-sql-tests.yml also applies to a `labeled` + # event, so the label needs this workflow of its own. + pull_request: + types: [labeled] + +permissions: {} + +jobs: + upstream-sql-tests: + name: Upstream SQL tests + if: github.event.label.name == 'tests:run-core-sql' + uses: ./.github/workflows/upstream-sql-tests.yml + permissions: + contents: read + + remove-label: + name: Remove the tests:run-core-sql label + needs: upstream-sql-tests + # The token of a pull request from a fork cannot write: remove the label + # by hand there. + if: >- + always() && github.event.label.name == 'tests:run-core-sql' && + github.event.pull_request.head.repo.full_name == github.repository + runs-on: ubuntu-26.04 + timeout-minutes: 5 + # A separate job, so that the pull request code in upstream-sql-tests + # never gets a token that can write. + permissions: + pull-requests: write + steps: + - name: Remove the label + env: + GH_TOKEN: ${{ github.token }} + REPO: ${{ github.repository }} + NUMBER: ${{ github.event.pull_request.number }} + run: gh api -X DELETE "repos/$REPO/issues/$NUMBER/labels/tests%3Arun-core-sql" || true diff --git a/.github/workflows/upstream-sql-tests.yml b/.github/workflows/upstream-sql-tests.yml index 8f9da35a..7b60e63a 100644 --- a/.github/workflows/upstream-sql-tests.yml +++ b/.github/workflows/upstream-sql-tests.yml @@ -3,11 +3,15 @@ name: Upstream SQL tests # Runs a curated subset of the ClickHouse core SQL tests # (tests/queries/0_stateless) through clickhouse-connect. See # tests/clickhouse-test-runner/README.md. +# +# upstream-sql-tests-label.yml also calls it, for the tests:run-core-sql label +# on a pull request. permissions: contents: read on: + workflow_call: workflow_dispatch: inputs: clickhouse_version: diff --git a/tests/clickhouse-test-runner/README.md b/tests/clickhouse-test-runner/README.md index 90fe265d..e12420f0 100644 --- a/tests/clickhouse-test-runner/README.md +++ b/tests/clickhouse-test-runner/README.md @@ -386,6 +386,14 @@ not try `.sh` tests. runs the allowlist nightly, manually, and on pushes to `main` and pull requests that change this directory or the workflow. +To run it on another pull request, for example a change in the client, add +the `tests:run-core-sql` label +([`upstream-sql-tests-label.yml`](../../.github/workflows/upstream-sql-tests-label.yml)). +The run tests the pull request as it is when the label is added, and removes +the label when it ends: to test a later push, add the label again. The token +of a pull request from a fork cannot remove the label, so remove it by hand +before you add it again. + - The matrix is 10 round-robin shards of the allowlist, about 1,020 tests each, at `-j 4`. After its upstream tests, the first shard also runs the unit and live tests of the harness.