Skip to content

Commit 8a7a909

Browse files
committed
Fix vendoring PRs for stable branches (1.3)
This is a backport of the PR duckdb#262 to `v1.3-ossivalis` stable branch. Nightly import of DuckDB engine sources ("vendoring") is performed by creating PRs on `vendoring-<branch>` base branches. After the tests are passed the PR is merged and `vendoring-<branch>` is re-created to be used in subsequent imports. This change fixes the vendoring branch re-creation to place it not always on the `main` branch, but on the correct branch (either `main` or stable one line `v1.3-ossivalis`).
1 parent d783fa6 commit 8a7a909

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

.github/workflows/Java.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -434,7 +434,7 @@ jobs:
434434
run: |
435435
# Delete vendoring-${{ github.base_ref }} branch and re-create it for future PRs
436436
git push --delete origin vendoring-${{ github.base_ref }}
437-
git checkout --track origin/main
437+
git checkout --track origin/${{ github.base_ref }}
438438
git pull --ff-only
439439
git branch vendoring-${{ github.base_ref }}
440440
git push origin vendoring-${{ github.base_ref }}

0 commit comments

Comments
 (0)