Skip to content

Commit 86738ba

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 f39e420 commit 86738ba

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
@@ -60,13 +60,14 @@ jobs:
6060
- name: Vendor sources
6161
id: vendor
6262
run: |
63+
export REV=$(cd .git/duckdb && git rev-parse --short HEAD && cd ../..)
64+
echo "Updating vendored DuckDB sources to $REV"
6365
git config --global user.email "github_bot@duckdblabs.com"
6466
git config --global user.name "DuckDB Labs GitHub Bot"
6567
git rm -rf src/duckdb
6668
python vendor.py --duckdb .git/duckdb
6769
git add src/duckdb CMakeLists.txt
6870
rm -rf .git/duckdb
69-
export REV=`git rev-parse --short HEAD`
7071
git commit -m "Update vendored DuckDB sources to $REV"
7172
git push --dry-run
7273
# Check if ahead of upstream branch
@@ -80,6 +81,10 @@ jobs:
8081
run: |
8182
git push -u origin HEAD
8283
84+
- name: Wait for push to complete
85+
if: steps.vendor.outputs.vendor != '' && github.event_name != 'pull_request'
86+
run: sleep 10 # Give GitHub a moment to process the push
87+
8388
rebuild:
8489
needs: vendor
8590
if: ${{ needs.vendor.outputs.did_vendor != '' }}

0 commit comments

Comments
 (0)