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

make apply_patches or make patch_duckdb to always succeed #1805

Merged
merged 2 commits into from
Aug 2, 2024
+12 −10
Merged

make apply_patches or make patch_duckdb to always succeed #1805

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
093425c
Add alternative name
carlopi Aug 2, 2024
712b19b
Move to alternative name
carlopi Aug 2, 2024
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
16 changes: 8 additions & 8 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ jobs:
- name: Prepare repository
run: |
(cd ./submodules/duckdb && git fetch --all --tags)
make patch_duckdb
make apply_patches
cd submodules/duckdb && git tag ${{ inputs.override_git_describe }}

- name: Prepare environment
Expand Down Expand Up @@ -296,7 +296,7 @@ jobs:
- name: Prepare repository
run: |
(cd ./submodules/duckdb && git fetch --all --tags)
make patch_duckdb
make apply_patches
cd submodules/duckdb && git tag ${{ inputs.override_git_describe }}

- name: Prepare environment
Expand Down Expand Up @@ -362,7 +362,7 @@ jobs:

- name: Prepare repository
run: |
make patch_duckdb
make apply_patches
cd submodules/duckdb && git tag ${{ inputs.override_git_describe }}

- uses: mymindstorm/setup-emsdk@v14
Expand Down Expand Up @@ -405,7 +405,7 @@ jobs:

- name: Prepare repository
run: |
make patch_duckdb
make apply_patches
cd submodules/duckdb && git tag ${{ inputs.override_git_describe }}

- uses: mymindstorm/setup-emsdk@v14
Expand Down Expand Up @@ -448,7 +448,7 @@ jobs:

- name: Prepare repository
run: |
make patch_duckdb
make apply_patches
cd submodules/duckdb && git tag ${{ inputs.override_git_describe }}

- uses: mymindstorm/setup-emsdk@v14
Expand Down Expand Up @@ -492,7 +492,7 @@ jobs:

- name: Prepare repository
run: |
make patch_duckdb
make apply_patches
cd submodules/duckdb && git tag ${{ inputs.override_git_describe }}

- uses: mymindstorm/setup-emsdk@v14
Expand Down Expand Up @@ -535,7 +535,7 @@ jobs:

- name: Prepare repository
run: |
make patch_duckdb
make apply_patches
cd submodules/duckdb && git tag ${{ inputs.override_git_describe }}

- uses: mymindstorm/setup-emsdk@v14
Expand Down Expand Up @@ -578,7 +578,7 @@ jobs:

- name: Prepare repository
run: |
make patch_duckdb
make apply_patches
cd submodules/duckdb && git tag ${{ inputs.override_git_describe }}

- uses: mymindstorm/setup-emsdk@v14
Expand Down
6 changes: 4 additions & 2 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -434,8 +434,10 @@ build/docker_ci_image:
touch build/docker_ci_image

patch_duckdb:
find patches/duckdb/* -type f -name '*.patch' -print0 | xargs -0 cat | patch -p1 --forward -d submodules/duckdb
find patches/arrow/* -type f -name '*.patch' -print0 | xargs -0 cat | patch -p1 --forward -d submodules/arrow
(find patches/duckdb/* -type f -name '*.patch' -print0 | xargs -0 cat | patch -p1 --forward -d submodules/duckdb) || true
(find patches/arrow/* -type f -name '*.patch' -print0 | xargs -0 cat | patch -p1 --forward -d submodules/arrow) || true

apply_patches: patch_duckdb

submodules:
git submodule update --init --recursive
Expand Down