From 51bf91ca4879d72af3da9028a70190f14b3ac0cb Mon Sep 17 00:00:00 2001 From: Polyglot AI <293096396+polyglotAI-bot@users.noreply.github.com> Date: Thu, 19 Nov 2026 15:41:44 +0000 Subject: [PATCH] ci: run the upstream SQL tests on a pull request with the tests:run-core-sql label upstream-sql-tests.yml starts only on pull requests that change the harness, the workflow or the library. A new workflow, upstream-sql-tests-label.yml, calls it on any pull request when a maintainer adds the tests:run-core-sql label, and then removes the label. The `paths` filter of the pull_request trigger also applies to a `labeled` event, so the label needs a workflow of its own; upstream-sql-tests.yml gets a workflow_call trigger and no other change. Co-Authored-By: Claude Opus 5.5 --- .../workflows/upstream-sql-tests-label.yml | 46 +++++++++++++++++++ .github/workflows/upstream-sql-tests.yml | 4 ++ tests/clickhouse-test-runner/README.md | 8 ++++ 3 files changed, 58 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..1f9a1313 --- /dev/null +++ b/.github/workflows/upstream-sql-tests-label.yml @@ -0,0 +1,46 @@ +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 of the documentation or of another +# workflow. 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-24.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 c6b60ede..893fdf5c 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-cpp. 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 307fb808..14c410cd 100644 --- a/tests/clickhouse-test-runner/README.md +++ b/tests/clickhouse-test-runner/README.md @@ -336,6 +336,14 @@ runs the allowlist nightly, manually, and on pushes and pull requests that change this directory, the workflow, or the library (`clickhouse/`, `contrib/`, `cmake/`, the root `CMakeLists.txt`). +To run it on another pull request, for example a change of the documentation +or of another workflow, 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 `build` job builds the shim once with `scripts/build.sh` and runs the unit tests. The test jobs use its programs. - The test jobs are 8 round-robin shards of the allowlist, about 1,250 tests