File tree Expand file tree Collapse file tree 1 file changed +10
-5
lines changed Expand file tree Collapse file tree 1 file changed +10
-5
lines changed Original file line number Diff line number Diff line change @@ -27,7 +27,9 @@ defaults:
2727jobs :
2828 commit_duckdb_submodule_sha :
2929 name : Commit the submodule to the given DuckDB sha
30- if : ${{ inputs.commit-duckdb-sha }}
30+ if : ${{ inputs.commit-duckdb-sha && false }}
31+ outputs :
32+ sha-after-commit : ${{ steps.commit_and_push.outputs.commit_sha }}
3133 runs-on : ubuntu-24.04
3234 steps :
3335
@@ -52,18 +54,21 @@ jobs:
5254 git add external/duckdb
5355 if git diff --cached --quiet; then
5456 echo "No changes to commit: submodule ref is unchanged."
55- exit 0
57+ else
58+ git commit -m "Update submodule ref"
59+ git push
5660 fi
57- git commit -m "Update submodule ref"
58- git push
61+ echo 'commit_sha=$( git log -1 --format="%h" )' >> $GITHUB_OUTPUT
5962
6063 externally_triggered_build :
6164 name : Build and test releases
65+ needs : commit_duckdb_submodule_sha
66+ if : always()
6267 uses : ./.github/workflows/packaging.yml
6368 with :
6469 minimal : false
6570 testsuite : all
66- git-ref : ${{ github.ref }}
71+ git-ref : ${{ needs.commit_duckdb_submodule_sha.outputs.sha-after-commit || github.ref }}
6772 duckdb-git-ref : ${{ inputs.duckdb-sha }}
6873 force-version : ${{ inputs.force-version }}
6974
You can’t perform that action at this time.
0 commit comments