Skip to content

Commit 52ef133

Browse files
authored
Merge branch 'main' into feat/replace-partitions-core
2 parents b03d790 + 755799d commit 52ef133

206 files changed

Lines changed: 10027 additions & 1281 deletions

File tree

Some content is hidden

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

.github/dependabot.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,10 @@ updates:
2626
day: "sunday"
2727
cooldown:
2828
default-days: 7
29+
groups:
30+
# The codeql-action init/autobuild/analyze steps must all run the
31+
# same version - split PRs cause a version mismatch that fails the
32+
# Analyze jobs. Group them so a single PR bumps all of them together.
33+
codeql-action:
34+
patterns:
35+
- "github/codeql-action*"

.github/workflows/asf-allowlist-check.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,11 @@
2424
name: "ASF Allowlist Check"
2525

2626
on:
27-
pull_request:
28-
types: [opened, synchronize, reopened, ready_for_review]
2927
push:
3028
branches:
3129
- main
30+
pull_request:
31+
types: [opened, synchronize, reopened, ready_for_review]
3232

3333
permissions:
3434
contents: read
@@ -38,7 +38,7 @@ jobs:
3838
if: ${{ github.event_name != 'pull_request' || github.event.pull_request.draft == false }}
3939
runs-on: ubuntu-slim
4040
steps:
41-
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
41+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
4242
with:
4343
persist-credentials: false
44-
- uses: apache/infrastructure-actions/allowlist-check@4e9c961f587f72b170874b6f5cd4ac15f7f26eb8 # main
44+
- uses: apache/infrastructure-actions/allowlist-check@4e9c961f587f72b170874b6f5cd4ac15f7f26eb8

.github/workflows/aws_test.yml

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@ name: AWS Tests
2020
on:
2121
push:
2222
branches:
23-
- '**'
24-
- '!dependabot/**'
23+
- main
2524
tags:
2625
- '**'
2726
pull_request:
@@ -78,7 +77,7 @@ jobs:
7877
SCCACHE_CACHE_SIZE: "2G"
7978
steps:
8079
- name: Checkout iceberg-cpp
81-
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
80+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
8281
with:
8382
persist-credentials: false
8483
- name: Install dependencies on Ubuntu
@@ -87,7 +86,7 @@ jobs:
8786
run: sudo apt-get update && sudo apt-get install -y libcurl4-openssl-dev libjitterentropy3-dev
8887
- name: Cache vcpkg packages
8988
if: ${{ startsWith(matrix.runs-on, 'ubuntu') && matrix.bundle_awssdk == 'OFF' }}
90-
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
89+
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
9190
id: vcpkg-cache
9291
with:
9392
path: /usr/local/share/vcpkg/installed
@@ -116,7 +115,7 @@ jobs:
116115
shell: bash
117116
run: bash ci/scripts/start_minio.sh
118117
- name: Restore sccache cache
119-
uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
118+
uses: actions/cache/restore@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
120119
with:
121120
path: ${{ github.workspace }}/.sccache
122121
key: sccache-aws-${{ matrix.runs-on }}-bundle${{ matrix.bundle_awssdk }}-s3${{ matrix.s3 }}-sigv4${{ matrix.sigv4 }}-${{ github.run_id }}
@@ -134,7 +133,7 @@ jobs:
134133
run: sccache --show-stats
135134
- name: Save sccache cache
136135
if: github.ref == 'refs/heads/main'
137-
uses: actions/cache/save@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
136+
uses: actions/cache/save@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
138137
with:
139138
path: ${{ github.workspace }}/.sccache
140139
key: sccache-aws-${{ matrix.runs-on }}-bundle${{ matrix.bundle_awssdk }}-s3${{ matrix.s3 }}-sigv4${{ matrix.sigv4 }}-${{ github.run_id }}
@@ -150,11 +149,11 @@ jobs:
150149
SCCACHE_DIR: ${{ github.workspace }}/.sccache
151150
SCCACHE_CACHE_SIZE: "2G"
152151
steps:
153-
- uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
152+
- uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0
154153
with:
155154
python-version: '3.x'
156155
- name: Checkout iceberg-cpp
157-
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
156+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
158157
with:
159158
persist-credentials: false
160159
- name: Install build dependencies
@@ -164,7 +163,7 @@ jobs:
164163
python3 -m pip install --upgrade pip
165164
python3 -m pip install -r requirements.txt
166165
- name: Cache vcpkg packages
167-
uses: actions/cache@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
166+
uses: actions/cache@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
168167
id: vcpkg-cache
169168
with:
170169
path: /usr/local/share/vcpkg/installed
@@ -190,7 +189,7 @@ jobs:
190189
echo "CC=sccache gcc-14" >> $GITHUB_ENV
191190
echo "CXX=sccache g++-14" >> $GITHUB_ENV
192191
- name: Restore sccache cache
193-
uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
192+
uses: actions/cache/restore@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
194193
with:
195194
path: ${{ github.workspace }}/.sccache
196195
key: sccache-meson-sigv4-${{ github.run_id }}
@@ -209,7 +208,7 @@ jobs:
209208
meson test -C builddir --timeout-multiplier 0 --print-errorlogs
210209
- name: Save sccache cache
211210
if: github.ref == 'refs/heads/main'
212-
uses: actions/cache/save@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
211+
uses: actions/cache/save@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
213212
with:
214213
path: ${{ github.workspace }}/.sccache
215214
key: sccache-meson-sigv4-${{ github.run_id }}

.github/workflows/codeql.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,12 @@ name: "CodeQL"
2121

2222
on:
2323
push:
24-
branches: [ "main" ]
24+
branches:
25+
- main
2526
pull_request:
2627
types: [opened, synchronize, reopened, ready_for_review]
27-
branches: [ "main" ]
28+
branches:
29+
- main
2830
schedule:
2931
- cron: '16 4 * * 1'
3032

@@ -47,16 +49,16 @@ jobs:
4749

4850
steps:
4951
- name: Checkout repository
50-
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
52+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
5153
with:
5254
persist-credentials: false
5355

5456
- name: Initialize CodeQL
55-
uses: github/codeql-action/init@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4.36.2
57+
uses: github/codeql-action/init@54f647b7e1bb85c95cddabcd46b0c578ec92bc1a # v4.36.3
5658
with:
5759
languages: actions
5860

5961
- name: Perform CodeQL Analysis
60-
uses: github/codeql-action/analyze@8aad20d150bbac5944a9f9d289da16a4b0d87c1e # v4.36.2
62+
uses: github/codeql-action/analyze@54f647b7e1bb85c95cddabcd46b0c578ec92bc1a # v4.36.3
6163
with:
6264
category: "/language:actions"

.github/workflows/cpp-linter.yml

Lines changed: 35 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,21 @@
1818
name: C++ Linter
1919

2020
on:
21-
pull_request:
22-
types: [opened, synchronize, reopened, ready_for_review]
21+
push:
22+
branches:
23+
- main
2324
paths-ignore:
2425
- '.github/**'
2526
- 'ci/**'
2627
- 'cmake_modules/**'
28+
pull_request:
29+
types: [opened, synchronize, reopened, ready_for_review]
2730
branches:
2831
- main
32+
paths-ignore:
33+
- '.github/**'
34+
- 'ci/**'
35+
- 'cmake_modules/**'
2936

3037
concurrency:
3138
group: ${{ github.repository }}-${{ github.head_ref || github.sha }}-${{ github.workflow }}
@@ -38,30 +45,54 @@ jobs:
3845
permissions:
3946
contents: read
4047
pull-requests: write
48+
env:
49+
SCCACHE_DIR: ${{ github.workspace }}/.sccache
50+
SCCACHE_CACHE_SIZE: "2G"
4151
steps:
4252
- name: Checkout iceberg-cpp
43-
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
53+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
4454
with:
4555
persist-credentials: false
4656
- name: Install dependencies
4757
shell: bash
4858
run: |
4959
sudo apt-get update
5060
sudo apt-get install -y libcurl4-openssl-dev libsqlite3-dev libpq-dev default-libmysqlclient-dev
61+
- name: Restore sccache cache
62+
uses: actions/cache/restore@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
63+
with:
64+
path: ${{ github.workspace }}/.sccache
65+
key: sccache-cpp-linter-ubuntu-${{ github.run_id }}
66+
restore-keys: |
67+
sccache-cpp-linter-ubuntu-
68+
- name: Setup sccache
69+
uses: mozilla-actions/sccache-action@9e7fa8a12102821edf02ca5dbea1acd0f89a2696 # v0.0.10
5170
- name: Run build
5271
env:
5372
CC: gcc-14
5473
CXX: g++-14
5574
run: |
5675
mkdir build && cd build
5776
cmake .. -G Ninja -DCMAKE_EXPORT_COMPILE_COMMANDS=ON \
77+
-DCMAKE_C_COMPILER_LAUNCHER=sccache \
78+
-DCMAKE_CXX_COMPILER_LAUNCHER=sccache \
5879
-DICEBERG_BUILD_SQL_CATALOG=ON \
5980
-DICEBERG_SQL_SQLITE=ON \
6081
-DICEBERG_SQL_POSTGRESQL=ON \
6182
-DICEBERG_SQL_MYSQL=ON
6283
cmake --build .
84+
- name: Show sccache stats
85+
shell: bash
86+
run: sccache --show-stats
87+
- name: Save sccache cache
88+
if: github.ref == 'refs/heads/main'
89+
uses: actions/cache/save@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
90+
with:
91+
path: ${{ github.workspace }}/.sccache
92+
key: sccache-cpp-linter-ubuntu-${{ github.run_id }}
6393
- uses: cpp-linter/cpp-linter-action@0f6d1b8d7e38b584cbee606eb23d850c217d54f8 # v2.15.1
6494
id: linter
95+
if: github.event_name == 'pull_request'
6596
continue-on-error: true
6697
env:
6798
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -78,7 +109,7 @@ jobs:
78109
# need '-fno-builtin-std-forward_like', see https://github.com/llvm/llvm-project/issues/101614
79110
extra-args: '-std=c++23 -I$PWD/src -I$PWD/build/src -I$PWD/build/_deps/sqlpp23-src/include -I/usr/include/postgresql -I/usr/include/mysql -fno-builtin-std-forward_like'
80111
- name: Fail fast?!
81-
if: steps.linter.outputs.checks-failed != 0
112+
if: github.event_name == 'pull_request' && steps.linter.outputs.checks-failed != 0
82113
run: |
83114
echo "some linter checks failed. ${STEPS_LINTER_OUTPUTS_CHECKS_FAILED}"
84115
exit 1

.github/workflows/docs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@ jobs:
3737
runs-on: ubuntu-slim
3838

3939
steps:
40-
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
40+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
4141
with:
4242
fetch-depth: 1
4343
persist-credentials: false
4444

45-
- uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
45+
- uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0
4646
with:
4747
python-version: '3.x'
4848

.github/workflows/license_check.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
runs-on: ubuntu-slim
3636
steps:
3737
- name: Checkout repository
38-
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
38+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
3939
with:
4040
persist-credentials: false
4141
- name: Check license header

.github/workflows/pre-commit.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@
1818
name: pre-commit
1919

2020
on:
21-
pull_request:
22-
types: [opened, synchronize, reopened, ready_for_review]
2321
push:
2422
branches:
2523
- '**'
2624
- '!dependabot/**'
25+
pull_request:
26+
types: [opened, synchronize, reopened, ready_for_review]
2727

2828
concurrency:
2929
group: ${{ github.repository }}-${{ github.head_ref || github.sha }}-${{ github.workflow }}
@@ -37,8 +37,8 @@ jobs:
3737
if: ${{ github.event_name != 'pull_request' || github.event.pull_request.draft == false }}
3838
runs-on: ubuntu-slim
3939
steps:
40-
- uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
40+
- uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
4141
with:
4242
persist-credentials: false
43-
- uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
43+
- uses: actions/setup-python@ece7cb06caefa5fff74198d8649806c4678c61a1 # v6.3.0
4444
- uses: pre-commit/action@2c7b3805fd2a0fd8c1884dcaebf91fc102a13ecd # v3.0.1

.github/workflows/rc.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
timeout-minutes: 5
3636
steps:
3737
- name: Checkout
38-
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
38+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
3939
with:
4040
persist-credentials: false
4141

@@ -87,7 +87,7 @@ jobs:
8787
CXX: g++-14
8888
steps:
8989
- name: Checkout
90-
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
90+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
9191
with:
9292
persist-credentials: false
9393

@@ -135,7 +135,7 @@ jobs:
135135
contents: write
136136
steps:
137137
- name: Checkout
138-
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
138+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
139139
with:
140140
persist-credentials: false
141141

.github/workflows/sanitizer_test.yml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@ name: ASAN and UBSAN Tests
2020
on:
2121
push:
2222
branches:
23-
- '**'
24-
- '!dependabot/**'
23+
- main
2524
tags:
2625
- '**'
2726
pull_request:
@@ -44,14 +43,14 @@ jobs:
4443
SCCACHE_CACHE_SIZE: "2G"
4544
steps:
4645
- name: Checkout iceberg-cpp
47-
uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
46+
uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
4847
with:
4948
persist-credentials: false
5049
- name: Install dependencies
5150
shell: bash
5251
run: sudo apt-get update && sudo apt-get install -y libcurl4-openssl-dev
5352
- name: Restore sccache cache
54-
uses: actions/cache/restore@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
53+
uses: actions/cache/restore@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
5554
with:
5655
path: ${{ github.workspace }}/.sccache
5756
key: sccache-sanitizer-ubuntu-${{ github.run_id }}
@@ -73,7 +72,7 @@ jobs:
7372
run: sccache --show-stats
7473
- name: Save sccache cache
7574
if: github.ref == 'refs/heads/main'
76-
uses: actions/cache/save@27d5ce7f107fe9357f9df03efb73ab90386fccae # v5.0.5
75+
uses: actions/cache/save@55cc8345863c7cc4c66a329aec7e433d2d1c52a9 # v6.1.0
7776
with:
7877
path: ${{ github.workspace }}/.sccache
7978
key: sccache-sanitizer-ubuntu-${{ github.run_id }}

0 commit comments

Comments
 (0)