@@ -25,14 +25,12 @@ 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
3433 steps :
35-
3634 - name : Checkout DuckDB Python
3735 uses : actions/checkout@v4
3836 with :
4745 git checkout ${{ inputs.duckdb-sha }}
4846
4947 - name : Commit and push new submodule ref
48+ if : ${{ inputs.commit-duckdb-sha }}
5049 # see https://github.com/actions/checkout?tab=readme-ov-file#push-a-commit-to-a-pr-using-the-built-in-token
5150 run : |
5251 git config user.name "github-actions[bot]"
@@ -58,25 +57,28 @@ jobs:
5857 git commit -m "Update submodule ref"
5958 git push
6059 fi
61- echo 'commit_sha=$( git log -1 --format="%h" )' >> $GITHUB_OUTPUT
60+
61+ - name : Get the SHA of the latest commit
62+ id : git_commit_sha
63+ run : |
64+ echo "commit_sha=$( git rev-parse HEAD )" >> $GITHUB_OUTPUT
6265
6366 externally_triggered_build :
6467 name : Build and test releases
65- needs : commit_duckdb_submodule_sha
66- if : always()
68+ needs : commit_submodule
6769 uses : ./.github/workflows/packaging.yml
6870 with :
6971 minimal : false
7072 testsuite : all
71- git-ref : ${{ needs.commit_duckdb_submodule_sha .outputs.sha-after-commit || github.ref }}
73+ git-ref : ${{ needs.commit_submodule .outputs.sha-after-commit }}
7274 duckdb-git-ref : ${{ inputs.duckdb-sha }}
7375 force-version : ${{ inputs.force-version }}
7476
7577 publish_s3 :
7678 name : Publish Artifacts to the S3 Staging Bucket
7779 runs-on : ubuntu-latest
7880 needs : [ externally_triggered_build ]
79- if : ${{ github.repository_owner == 'duckdb' && inputs.publish-packages && needs.externally_triggered_build.result == 'success' && always() }}
81+ if : ${{ github.repository_owner == 'duckdb' && inputs.publish-packages }}
8082 steps :
8183 - name : Fetch artifacts
8284 uses : actions/download-artifact@v4
0 commit comments