Skip to content

Commit 4ea8a30

Browse files
committed
Use engine commit hash when vendoring sources
This PR brings #duckdb/duckdb-odbc/84 changes to JDBC repo. Testing: no code changes, no new tests.
1 parent fcd50cd commit 4ea8a30

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

.github/workflows/Nightly.yml

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,14 @@ jobs:
3838
- name: Vendor sources
3939
id: vendor
4040
run: |
41+
export REV=$(cd .git/duckdb && git rev-parse --short HEAD && cd ../..)
42+
echo "Updating vendored DuckDB sources to $REV"
4143
git config --global user.email "[email protected]"
4244
git config --global user.name "DuckDB Labs GitHub Bot"
4345
git rm -rf src/duckdb
4446
python vendor.py --duckdb .git/duckdb
4547
git add src/duckdb CMakeLists.txt
4648
rm -rf .git/duckdb
47-
export REV=`git rev-parse --short HEAD`
4849
git commit -m "Update vendored DuckDB sources to $REV"
4950
git push --dry-run
5051
# Check if ahead of upstream branch
@@ -58,6 +59,10 @@ jobs:
5859
run: |
5960
git push -u origin HEAD
6061
62+
- name: Wait for push to complete
63+
if: steps.vendor.outputs.vendor != '' && github.event_name != 'pull_request'
64+
run: sleep 10 # Give GitHub a moment to process the push
65+
6166
rebuild:
6267
needs: vendor
6368
if: ${{ needs.vendor.outputs.did_vendor != '' }}

0 commit comments

Comments
 (0)