Skip to content

Use engine commit hash when vendoring sources #172

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.

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

Merged
merged 1 commit into from
Apr 21, 2025
Merged
Changes from all commits
Commits
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
27 changes: 5 additions & 22 deletions .github/workflows/Nightly.yml → .github/workflows/Vendor.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
name: Vendor
on:
push:
branches:
- main
paths:
- ".github/workflows/Nightly.yml"
- "vendor.py"
workflow_call:
inputs:
duckdb-sha:
Expand All @@ -19,28 +14,21 @@ on:
required: false
default: ''
type: 'string'
schedule:
- cron: "17 0 * * *"

name: Vendor upstream DuckDB sources

jobs:
vendor:
runs-on: ubuntu-latest
outputs:
did_vendor: ${{ steps.vendor.outputs.vendor }}

name: "Update vendored sources"
name: "Update Vendored Sources"
if: github.repository == 'duckdb/duckdb-java'

steps:
- uses: actions/setup-python@v5
with:
python-version: '3.10'

- uses: actions/checkout@v4
with:
fetch-depth: 0
token: ${{ secrets.PAT_TOKEN }}

- uses: actions/checkout@v4
with:
Expand All @@ -60,13 +48,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 @@ -79,9 +68,3 @@ jobs:
- if: steps.vendor.outputs.vendor != '' && github.event_name != 'pull_request'
run: |
git push -u origin HEAD

rebuild:
needs: vendor
if: ${{ needs.vendor.outputs.did_vendor != '' }}
uses: ./.github/workflows/Java.yml
secrets: inherit
Loading