@@ -25,14 +25,14 @@ defaults:
2525 shell : bash
2626
2727jobs :
28- commit_duckdb_submodule_sha :
28+ commit_submodule :
2929 name : Commit the submodule to the given DuckDB sha
30- if : ${{ inputs.commit-duckdb-sha && false }}
3130 outputs :
32- sha-after-commit : ${{ steps.commit_and_push .outputs.commit_sha }}
31+ sha-after-commit : ${{ steps.git_commit_sha .outputs.commit_sha }}
3332 runs-on : ubuntu-24.04
33+ permissions :
34+ contents : write
3435 steps :
35-
3636 - name : Checkout DuckDB Python
3737 uses : actions/checkout@v4
3838 with :
4747 git checkout ${{ inputs.duckdb-sha }}
4848
4949 - name : Commit and push new submodule ref
50+ if : ${{ inputs.commit-duckdb-sha }}
5051 # see https://github.com/actions/checkout?tab=readme-ov-file#push-a-commit-to-a-pr-using-the-built-in-token
5152 run : |
5253 git config user.name "github-actions[bot]"
@@ -58,25 +59,28 @@ jobs:
5859 git commit -m "Update submodule ref"
5960 git push
6061 fi
61- echo 'commit_sha=$( git log -1 --format="%h" )' >> $GITHUB_OUTPUT
62+
63+ - name : Get the SHA of the latest commit
64+ id : git_commit_sha
65+ run : |
66+ echo "commit_sha=$( git rev-parse HEAD )" >> $GITHUB_OUTPUT
6267
6368 externally_triggered_build :
6469 name : Build and test releases
65- needs : commit_duckdb_submodule_sha
66- if : always()
70+ needs : commit_submodule
6771 uses : ./.github/workflows/packaging.yml
6872 with :
6973 minimal : false
7074 testsuite : all
71- git-ref : ${{ needs.commit_duckdb_submodule_sha .outputs.sha-after-commit || github.ref }}
75+ git-ref : ${{ needs.commit_submodule .outputs.sha-after-commit }}
7276 duckdb-git-ref : ${{ inputs.duckdb-sha }}
7377 force-version : ${{ inputs.force-version }}
7478
7579 publish_s3 :
7680 name : Publish Artifacts to the S3 Staging Bucket
7781 runs-on : ubuntu-latest
7882 needs : [ externally_triggered_build ]
79- if : ${{ github.repository_owner == 'duckdb' && inputs.publish-packages && needs.externally_triggered_build.result == 'success' && always() }}
83+ if : ${{ github.repository_owner == 'duckdb' && inputs.publish-packages }}
8084 steps :
8185 - name : Fetch artifacts
8286 uses : actions/download-artifact@v4
0 commit comments