From 4ea8a30666b151e177c7070309402d6edcfcd866 Mon Sep 17 00:00:00 2001 From: Alex Kasko Date: Thu, 20 Mar 2025 21:51:34 +0000 Subject: [PATCH] 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. --- .github/workflows/Nightly.yml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/.github/workflows/Nightly.yml b/.github/workflows/Nightly.yml index 955eb483c..cbb1d74dc 100644 --- a/.github/workflows/Nightly.yml +++ b/.github/workflows/Nightly.yml @@ -38,13 +38,14 @@ jobs: - name: Vendor sources id: vendor run: | + export REV=$(cd .git/duckdb && git rev-parse --short HEAD && cd ../..) + echo "Updating vendored DuckDB sources to $REV" git config --global user.email "github_bot@duckdblabs.com" git config --global user.name "DuckDB Labs GitHub Bot" git rm -rf src/duckdb python vendor.py --duckdb .git/duckdb git add src/duckdb CMakeLists.txt rm -rf .git/duckdb - export REV=`git rev-parse --short HEAD` git commit -m "Update vendored DuckDB sources to $REV" git push --dry-run # Check if ahead of upstream branch @@ -58,6 +59,10 @@ jobs: run: | git push -u origin HEAD + - name: Wait for push to complete + if: steps.vendor.outputs.vendor != '' && github.event_name != 'pull_request' + run: sleep 10 # Give GitHub a moment to process the push + rebuild: needs: vendor if: ${{ needs.vendor.outputs.did_vendor != '' }}