Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use engine commit hash when vendoring sources #172

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
+6 −1
Draft

Use engine commit hash when vendoring sources #172

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion .github/workflows/Nightly.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 "[email protected]"
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
Expand All @@ -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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you expand on why this sleep is necessary? Doesn't the push complete otherwise?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

M, I've just copied this bit from the latest ODBC workflow to keep JDBC in sync with it. I will re-check.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As an update on this, I've got some input on GH workflows from Carlo, as a result the vendoring process in ODBC is being changed to import engine sources into a separate branch, create a PR on this branch and merge this PR automatically. In this variant the testing workflow is dispatched by triggering the pull_request event instead of a direct dispatch, so we do not need to wait manually until the push completes. I intend to bring the same workflow changes to JDBC once they are approved for ODBC, keeping this PR as a "draft" for now.


rebuild:
needs: vendor
if: ${{ needs.vendor.outputs.did_vendor != '' }}
Expand Down
Loading