Skip to content

Commit c98d283

Browse files
committed
Merge with v1.5-variegata
2 parents 5739cea + b403eb9 commit c98d283

File tree

3,512 files changed

+173918
-144722
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

3,512 files changed

+173918
-144722
lines changed

.github/actions/build_extensions/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ runs:
112112
if: ${{ inputs.vcpkg_build == 1 }}
113113
uses: lukka/run-vcpkg@v11.1
114114
with:
115-
vcpkgGitCommitId: ce613c41372b23b1f51333815feb3edd87ef8a8b
115+
vcpkgGitCommitId: 84bab45d415d22042bd0b9081aea57f362da3f35
116116

117117
- name: Set vcpkg env variables
118118
if: ${{ inputs.vcpkg_build == 1 }}
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
name: 'Setup Ccache'
2+
runs:
3+
using: "composite"
4+
steps:
5+
- name: Setup Ccache
6+
uses: hendrikmuhs/ccache-action@main
7+
with:
8+
key: ${{ github.job }}
9+
save: ${{ github.repository != 'duckdb/duckdb' || contains('["refs/heads/main", "refs/heads/v1.4-andium", "refs/heads/v1.5-variegata"]', github.ref) }}
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
name: 'Cleanup Runner'
2+
runs:
3+
using: "composite"
4+
steps:
5+
- name: Before
6+
shell: bash
7+
run: df -h
8+
9+
- name: Free disk space (Ubuntu)
10+
uses: endersonmenezes/free-disk-space@v3
11+
if: runner.os == 'Linux'
12+
with:
13+
rm_cmd: "rmz" # apparently faster
14+
remove_android: true
15+
remove_dotnet: true
16+
remove_haskell: true
17+
remove_tool_cache: true
18+
remove_folders: /opt/az /opt/ghc /opt/google /opt/hostedtoolcache /opt/microsoft /usr/lib/firefox /usr/lib/jvm /usr/local/.ghcup /usr/local/julia* /usr/local/lib/android /usr/local/share/boost /usr/local/share/chromium /usr/local/share/powershell /usr/share/dotnet /usr/share/swift /var/lib/apt/lists/*
19+
20+
- name: Free disk space (MacOS)
21+
if: runner.os == 'macOS'
22+
shell: bash
23+
run: |
24+
sudo rm -rfv /Users/runner/Library/Android/sdk
25+
26+
- name: After
27+
shell: bash
28+
run: df -h
Lines changed: 5 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,14 @@
1-
# https://github.com/pierotofy/set-swap-space
21
name: 'Set Swap Space'
32
description: 'Add moar swap'
43
inputs:
54
swap-size-gb:
65
description: 'Swap space to create, in Gigabytes.'
76
required: false
8-
default: '10'
7+
default: '8'
98
runs:
109
using: "composite"
1110
steps:
12-
- name: Swap space report before modification
13-
shell: bash
14-
run: |
15-
echo "Memory and swap:"
16-
free -h
17-
echo
18-
swapon --show
19-
echo
20-
- name: Set Swap
21-
shell: bash
22-
run: |
23-
export SWAP_FILE=$(swapon --show=NAME | tail -n 1)
24-
sudo swapoff $SWAP_FILE
25-
sudo rm $SWAP_FILE
26-
sudo fallocate -l ${{ inputs.swap-size-gb }}G $SWAP_FILE
27-
sudo chmod 600 $SWAP_FILE
28-
sudo mkswap $SWAP_FILE
29-
sudo swapon $SWAP_FILE
30-
- name: Swap space report after modification
31-
shell: bash
32-
run: |
33-
echo "Memory and swap:"
34-
free -h
35-
echo
36-
swapon --show
37-
echo
11+
- uses: pierotofy/set-swap-space@v1.0
12+
if: runner.os == 'Linux'
13+
with:
14+
swap-size-gb: ${{ inputs.swap-size-gb }}
Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
if (NOT MINGW)
22
duckdb_extension_load(avro
3-
LOAD_TESTS DONT_LINK
3+
LOAD_TESTS
44
GIT_URL https://github.com/duckdb/duckdb-avro
5-
GIT_TAG 7b75062f6345d11c5342c09216a75c57342c2e82
6-
APPLY_PATCHES
5+
GIT_TAG e4bd712795ecb31f97106880c6f2843ffea630f1
76
)
87
endif()
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
if (NOT MINGW AND NOT ${WASM_ENABLED})
22
duckdb_extension_load(aws
3-
### TODO: re-enable LOAD_TESTS
3+
LOAD_TESTS
44
GIT_URL https://github.com/duckdb/duckdb-aws
5-
GIT_TAG 18803d5e55b9f9f6dda5047d0fdb4f4238b6801d
5+
GIT_TAG bc15d211f282d1d78fc0d9fda3d09957ba776423
66
)
77
endif()
Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
if (NOT MINGW AND NOT ${WASM_ENABLED})
2-
duckdb_extension_load(azure
3-
LOAD_TESTS
4-
GIT_URL https://github.com/duckdb/duckdb-azure
5-
GIT_TAG 0709c0fa1cf67a668b58b1f06ff3e5fc1696e10a
6-
)
2+
duckdb_extension_load(azure
3+
LOAD_TESTS
4+
GIT_URL https://github.com/duckdb/duckdb-azure
5+
GIT_TAG 7e1ac3333d946a6bf5b4552722743e03f30a47cd
6+
)
77
endif()
Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
if (NOT MINGW AND NOT ${WASM_ENABLED})
22
duckdb_extension_load(delta
33
GIT_URL https://github.com/duckdb/duckdb-delta
4-
GIT_TAG 03aaf0f073bc622ade27c158d32473588b32aa8b
4+
GIT_TAG afb1a9d0995854324a796c11719a81d1ce18b92a
55
SUBMODULES extension-ci-tools
6-
APPLY_PATCHES
76
)
8-
endif()
7+
endif()
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
duckdb_extension_load(ducklake
2-
DONT_LINK
32
GIT_URL https://github.com/duckdb/ducklake
4-
GIT_TAG f134ad86f2f6e7cdf4133086c38ecd9c48f1a772
3+
GIT_TAG 1fb50273e4abfebb6b78cdfe35989b1c66792839
4+
APPLY_PATCHES
55
)
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
duckdb_extension_load(excel
22
LOAD_TESTS
33
GIT_URL https://github.com/duckdb/duckdb-excel
4-
GIT_TAG 8504be9ec8183e4082141f9359b53a64d3a440b7
4+
GIT_TAG 9421a2d75bd7544336caa73e5f9e6063cc7f6992
55
INCLUDE_DIR src/excel/include
6+
APPLY_PATCHES
67
)

0 commit comments

Comments
 (0)