From a965f4e733fdda7cbca3c821c2b2b896e761daff Mon Sep 17 00:00:00 2001 From: Evert Date: Mon, 14 Jul 2025 13:41:22 +0200 Subject: [PATCH 1/2] Fix on-pr workflow --- .github/workflows/on_pr.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/on_pr.yml b/.github/workflows/on_pr.yml index 5b727166..4a958252 100644 --- a/.github/workflows/on_pr.yml +++ b/.github/workflows/on_pr.yml @@ -19,6 +19,7 @@ concurrency: cancel-in-progress: true jobs: + packaging_test: name: Build a minimal set of packages and run all tests on them # Skip packaging tests for draft PRs @@ -27,13 +28,14 @@ jobs: with: minimal: true testsuite: all - git_ref: ${{ github.ref }} - duckdb_git_ref: ${{ github.ref_name }} + git_ref: ${{ github.head_ref }} + duckdb_git_ref: ${{ github.base_ref }} coverage_test: name: Run coverage tests if: ${{ github.event_name != 'pull_request' || github.event.pull_request.draft == false }} uses: ./.github/workflows/coverage.yml with: - git_ref: ${{ github.ref }} + git_ref: ${{ github.head_ref }} + duckdb_git_ref: ${{ github.base_ref }} testsuite: all From ba73967f0593deae3d87d798137d000c4060dde6 Mon Sep 17 00:00:00 2001 From: Evert Date: Mon, 14 Jul 2025 14:08:44 +0200 Subject: [PATCH 2/2] Allow empty git ref for checkout --- .github/workflows/coverage.yml | 7 ++++--- .github/workflows/on_pr.yml | 2 -- .github/workflows/pypi_packaging.yml | 7 +++---- 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index 2c05d032..fdd2a838 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -5,11 +5,11 @@ on: git_ref: type: string description: Git ref of the DuckDB python package - default: refs/heads/main - required: true + required: false duckdb_git_ref: type: string description: Git ref of DuckDB + required: false testsuite: type: choice description: Testsuite to run ('all' or 'fast') @@ -23,9 +23,10 @@ on: git_ref: type: string description: Git ref of the DuckDB python package - required: true + required: false duckdb_git_ref: type: string + required: false testsuite: type: string description: Testsuite to run ('all' or 'fast') diff --git a/.github/workflows/on_pr.yml b/.github/workflows/on_pr.yml index 4a958252..81fd3247 100644 --- a/.github/workflows/on_pr.yml +++ b/.github/workflows/on_pr.yml @@ -28,7 +28,6 @@ jobs: with: minimal: true testsuite: all - git_ref: ${{ github.head_ref }} duckdb_git_ref: ${{ github.base_ref }} coverage_test: @@ -36,6 +35,5 @@ jobs: if: ${{ github.event_name != 'pull_request' || github.event.pull_request.draft == false }} uses: ./.github/workflows/coverage.yml with: - git_ref: ${{ github.head_ref }} duckdb_git_ref: ${{ github.base_ref }} testsuite: all diff --git a/.github/workflows/pypi_packaging.yml b/.github/workflows/pypi_packaging.yml index a7f659f9..ef4f527a 100644 --- a/.github/workflows/pypi_packaging.yml +++ b/.github/workflows/pypi_packaging.yml @@ -19,8 +19,7 @@ on: git_ref: type: string description: Git ref of the DuckDB python package - required: true - default: refs/heads/main + required: false duckdb_git_ref: type: string description: Git ref of DuckDB @@ -44,11 +43,11 @@ on: git_ref: type: string description: Git ref of the DuckDB python package - required: true + required: false duckdb_git_ref: type: string description: Git ref of DuckDB - required: true + required: false force_version: description: Force version (vX.Y.Z-((rc|post)N)) required: false