Skip to content

Commit a529aae

Browse files
author
Evert
committed
Merge remote-tracking branch 'upstream/v1.3-ossivalis' into merge_with_v13
2 parents fdb2711 + 70b551f commit a529aae

File tree

4 files changed

+38
-10
lines changed

4 files changed

+38
-10
lines changed

.github/workflows/coverage.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ on:
55
git_ref:
66
type: string
77
description: Git ref of the DuckDB python package
8-
default: refs/heads/main
9-
required: true
8+
required: false
109
duckdb_git_ref:
1110
type: string
1211
description: Git ref of DuckDB
12+
required: false
1313
testsuite:
1414
type: choice
1515
description: Testsuite to run ('all' or 'fast')
@@ -23,9 +23,10 @@ on:
2323
git_ref:
2424
type: string
2525
description: Git ref of the DuckDB python package
26-
required: true
26+
required: false
2727
duckdb_git_ref:
2828
type: string
29+
required: false
2930
testsuite:
3031
type: string
3132
description: Testsuite to run ('all' or 'fast')
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
name: Builds triggered externally by DuckDB
2+
on:
3+
workflow_dispatch:
4+
inputs:
5+
duckdb-sha:
6+
type: string
7+
description: The DuckDB SHA to build against
8+
required: true
9+
force_version:
10+
type: string
11+
description: Force version (vX.Y.Z-((rc|post)N))
12+
required: false
13+
publish_to_pypi:
14+
type: boolean
15+
description: Publish packages to PyPI?
16+
required: true
17+
default: false
18+
19+
jobs:
20+
externally_triggered_build:
21+
name: Build and test releases
22+
uses: ./.github/workflows/pypi_packaging.yml
23+
with:
24+
minimal: false
25+
testsuite: all
26+
git_ref: ${{ github.ref }}
27+
duckdb_git_ref: ${{ inputs.duckdb-sha }}
28+
force_version: ${{ inputs.force_version }}

.github/workflows/on_pr.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ concurrency:
1919
cancel-in-progress: true
2020

2121
jobs:
22+
2223
packaging_test:
2324
name: Build a minimal set of packages and run all tests on them
2425
# Skip packaging tests for draft PRs
@@ -27,13 +28,12 @@ jobs:
2728
with:
2829
minimal: true
2930
testsuite: all
30-
git_ref: ${{ github.ref }}
31-
duckdb_git_ref: ${{ github.ref_name }}
31+
duckdb_git_ref: ${{ github.base_ref }}
3232

3333
coverage_test:
3434
name: Run coverage tests
3535
if: ${{ github.event_name != 'pull_request' || github.event.pull_request.draft == false }}
3636
uses: ./.github/workflows/coverage.yml
3737
with:
38-
git_ref: ${{ github.ref }}
38+
duckdb_git_ref: ${{ github.base_ref }}
3939
testsuite: all

.github/workflows/pypi_packaging.yml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@ on:
1919
git_ref:
2020
type: string
2121
description: Git ref of the DuckDB python package
22-
required: true
23-
default: refs/heads/main
22+
required: false
2423
duckdb_git_ref:
2524
type: string
2625
description: Git ref of DuckDB
@@ -44,11 +43,11 @@ on:
4443
git_ref:
4544
type: string
4645
description: Git ref of the DuckDB python package
47-
required: true
46+
required: false
4847
duckdb_git_ref:
4948
type: string
5049
description: Git ref of DuckDB
51-
required: true
50+
required: false
5251
force_version:
5352
description: Force version (vX.Y.Z-((rc|post)N))
5453
required: false

0 commit comments

Comments
 (0)