Skip to content

Commit 2b81659

Browse files
committed
Push given duckdb sha as submodule ref
1 parent cff3a56 commit 2b81659

File tree

4 files changed

+40
-5
lines changed

4 files changed

+40
-5
lines changed

.github/workflows/on_external_dispatch.yml

Lines changed: 38 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ on:
66
type: string
77
description: The DuckDB SHA to build against
88
required: true
9+
commit_duckdb_sha:
10+
type: boolean
11+
description: Set (commit) the DuckDB submodule to the given SHA
12+
default: false
913
force_version:
1014
type: string
1115
description: Force version (vX.Y.Z-((rc|post)N))
@@ -14,12 +18,44 @@ on:
1418
type: boolean
1519
description: Publish to S3
1620
required: true
17-
default: false
21+
default: true
22+
23+
defaults:
24+
run:
25+
shell: bash
1826

1927
jobs:
28+
commit_duckdb_submodule_sha:
29+
name: Commit the submodule to the given DuckDB sha
30+
if: ${{ inputs.commit_duckdb_sha }}
31+
runs-on: ubuntu-24.04
32+
steps:
33+
34+
- name: Checkout DuckDB Python
35+
uses: actions/checkout@v4
36+
with:
37+
ref: ${{ github.ref }}
38+
fetch-depth: 0
39+
submodules: true
40+
41+
- name: Checkout DuckDB
42+
run: |
43+
cd external/duckdb
44+
git fetch origin
45+
git checkout ${{ inputs.duckdb_git_ref }}
46+
47+
- name: Commit and push new submodule ref
48+
# see https://github.com/actions/checkout?tab=readme-ov-file#push-a-commit-to-a-pr-using-the-built-in-token
49+
run: |
50+
git config user.name "github-actions[bot]"
51+
git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
52+
git add external/duckdb
53+
git commit -m "Update submodule ref"
54+
git push
55+
2056
externally_triggered_build:
2157
name: Build and test releases
22-
uses: ./.github/workflows/pypi_packaging.yml
58+
uses: ./.github/workflows/packaging.yml
2359
with:
2460
minimal: false
2561
testsuite: all
@@ -51,7 +87,6 @@ jobs:
5187
# semantics: if a version is forced then we upload into a folder by the version name, otherwise we upload
5288
# into a folder that is named <run id>-<run-attempt>. Only the latter will be discovered be
5389
# upload_to_pypi.yml.
54-
shell: bash
5590
run: |
5691
FOLDER="${{ inputs.force_version != '' && inputs.force_version || format('{0}-{1}', github.run_id, github.run_attempt) }}"
5792
aws s3 cp artifacts s3://duckdb-staging/${{ github.repository }}/${FOLDER}/ --recursive

.github/workflows/on_pr.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
name: Build a minimal set of packages and run all tests on them
2525
# Skip packaging tests for draft PRs
2626
if: ${{ github.event_name != 'pull_request' || github.event.pull_request.draft == false }}
27-
uses: ./.github/workflows/pypi_packaging.yml
27+
uses: ./.github/workflows/packaging.yml
2828
with:
2929
minimal: true
3030
testsuite: all

.github/workflows/on_push_postrelease.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
packaging_test:
3434
name: Build and test post release packages and upload to S3
3535
needs: extract_duckdb_tag
36-
uses: ./.github/workflows/pypi_packaging.yml
36+
uses: ./.github/workflows/packaging.yml
3737
with:
3838
minimal: false
3939
testsuite: all
File renamed without changes.

0 commit comments

Comments
 (0)