Skip to content

Commit 744ef56

Browse files
shangxinlishangxinli
authored
Merge branch 'main' into pr-a-incremental-cleanup
2 parents c7af095 + fc80e4b commit 744ef56

101 files changed

Lines changed: 3590 additions & 555 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/workflows/asf-allowlist-check.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
asf-allowlist-check:
4141
runs-on: ubuntu-24.04
4242
steps:
43-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
43+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
4444
with:
4545
persist-credentials: false
4646
- uses: apache/infrastructure-actions/allowlist-check@4e9c961f587f72b170874b6f5cd4ac15f7f26eb8 # main

‎.github/workflows/codeql.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,16 +41,16 @@ jobs:
4141

4242
steps:
4343
- name: Checkout repository
44-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
44+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
4545
with:
4646
persist-credentials: false
4747

4848
- name: Initialize CodeQL
49-
uses: github/codeql-action/init@c10b8064de6f491fea524254123dbe5e09572f13 # v4.35.1
49+
uses: github/codeql-action/init@95e58e9a2cdfd71adc6e0353d5c52f41a045d225 # v4.35.2
5050
with:
5151
languages: actions
5252

5353
- name: Perform CodeQL Analysis
54-
uses: github/codeql-action/analyze@c10b8064de6f491fea524254123dbe5e09572f13 # v4.35.1
54+
uses: github/codeql-action/analyze@95e58e9a2cdfd71adc6e0353d5c52f41a045d225 # v4.35.2
5555
with:
5656
category: "/language:actions"

‎.github/workflows/cpp-linter.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
pull-requests: write
3535
steps:
3636
- name: Checkout iceberg-cpp
37-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
37+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
3838
with:
3939
persist-credentials: false
4040
- name: Install dependencies

‎.github/workflows/docs.yml‎

Lines changed: 5 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@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
40+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
4141
with:
4242
fetch-depth: 1
4343
persist-credentials: false
4444

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

@@ -63,9 +63,12 @@ jobs:
6363
6464
- name: Deploy to gh-pages
6565
if: github.event_name == 'push' && github.ref == 'refs/heads/main'
66+
env:
67+
GITHUB_TOKEN: ${{ github.token }}
6668
run: |
6769
git config --global user.name 'GitHub Actions'
6870
git config --global user.email 'actions@github.com'
71+
git remote set-url origin "https://x-access-token:${GITHUB_TOKEN}@github.com/${GITHUB_REPOSITORY}.git"
6972
7073
git checkout --orphan gh-pages-tmp
7174
git rm --quiet -rf .

‎.github/workflows/license_check.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ jobs:
2828
runs-on: ubuntu-slim
2929
steps:
3030
- name: Checkout repository
31-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
31+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
3232
with:
3333
persist-credentials: false
3434
- name: Check license header

‎.github/workflows/pre-commit.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ jobs:
3131
pre-commit:
3232
runs-on: ubuntu-slim
3333
steps:
34-
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
34+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
3535
with:
3636
persist-credentials: false
37-
- uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6
37+
- uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
3838
- uses: pre-commit/action@2c7b3805fd2a0fd8c1884dcaebf91fc102a13ecd # v3.0.1

‎.github/workflows/rc.yml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
timeout-minutes: 5
3535
steps:
3636
- name: Checkout
37-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
37+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
3838
with:
3939
persist-credentials: false
4040

@@ -86,11 +86,11 @@ jobs:
8686
CXX: g++-14
8787
steps:
8888
- name: Checkout
89-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
89+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
9090
with:
9191
persist-credentials: false
9292

93-
- uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8
93+
- uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
9494
with:
9595
name: archive
9696

@@ -134,11 +134,11 @@ jobs:
134134
contents: write
135135
steps:
136136
- name: Checkout
137-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
137+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
138138
with:
139139
persist-credentials: false
140140

141-
- uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8
141+
- uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
142142
with:
143143
name: archive
144144

‎.github/workflows/s3_test.yml‎

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing,
12+
# software distributed under the License is distributed on an
13+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
# KIND, either express or implied. See the License for the
15+
# specific language governing permissions and limitations
16+
# under the License.
17+
18+
# S3-backed tests against MinIO (Linux and macOS only).
19+
name: S3 Tests
20+
21+
on:
22+
push:
23+
branches:
24+
- '**'
25+
- '!dependabot/**'
26+
tags:
27+
- '**'
28+
pull_request:
29+
30+
concurrency:
31+
group: ${{ github.repository }}-${{ github.head_ref || github.sha }}-${{ github.workflow }}
32+
cancel-in-progress: true
33+
34+
permissions:
35+
contents: read
36+
37+
env:
38+
ICEBERG_HOME: /tmp/iceberg
39+
40+
jobs:
41+
s3-minio:
42+
name: S3 (${{ matrix.title }})
43+
runs-on: ${{ matrix.runs-on }}
44+
timeout-minutes: 35
45+
strategy:
46+
fail-fast: false
47+
matrix:
48+
include:
49+
- title: AMD64 Ubuntu 24.04
50+
runs-on: ubuntu-24.04
51+
CC: gcc-14
52+
CXX: g++-14
53+
- title: AArch64 macOS 26
54+
runs-on: macos-26
55+
env:
56+
ICEBERG_TEST_S3_URI: s3://iceberg-test
57+
AWS_ACCESS_KEY_ID: minio
58+
AWS_SECRET_ACCESS_KEY: minio123
59+
AWS_DEFAULT_REGION: us-east-1
60+
AWS_ENDPOINT_URL: http://127.0.0.1:9000
61+
AWS_EC2_METADATA_DISABLED: "TRUE"
62+
steps:
63+
- name: Checkout iceberg-cpp
64+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
65+
with:
66+
persist-credentials: false
67+
- name: Install dependencies on Ubuntu
68+
if: ${{ startsWith(matrix.runs-on, 'ubuntu') }}
69+
shell: bash
70+
run: sudo apt-get update && sudo apt-get install -y libcurl4-openssl-dev
71+
- name: Set Ubuntu Compilers
72+
if: ${{ startsWith(matrix.runs-on, 'ubuntu') }}
73+
run: |
74+
echo "CC=${{ matrix.CC }}" >> $GITHUB_ENV
75+
echo "CXX=${{ matrix.CXX }}" >> $GITHUB_ENV
76+
- name: Start MinIO
77+
shell: bash
78+
run: bash ci/scripts/start_minio.sh
79+
- name: Build and test Iceberg with S3
80+
shell: bash
81+
run: ci/scripts/build_iceberg.sh "$(pwd)" OFF OFF ON

‎.github/workflows/sanitizer_test.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
runs-on: ubuntu-24.04
4040
steps:
4141
- name: Checkout iceberg-cpp
42-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
42+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
4343
with:
4444
persist-credentials: false
4545
- name: Install dependencies

‎.github/workflows/test.yml‎

Lines changed: 12 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -43,24 +43,14 @@ jobs:
4343
timeout-minutes: 30
4444
strategy:
4545
fail-fast: false
46-
env:
47-
ICEBERG_TEST_S3_URI: s3://iceberg-test
48-
AWS_ACCESS_KEY_ID: minio
49-
AWS_SECRET_ACCESS_KEY: minio123
50-
AWS_DEFAULT_REGION: us-east-1
51-
AWS_ENDPOINT_URL: http://127.0.0.1:9000
52-
AWS_EC2_METADATA_DISABLED: "TRUE"
5346
steps:
5447
- name: Checkout iceberg-cpp
55-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
48+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
5649
with:
5750
persist-credentials: false
5851
- name: Install dependencies
5952
shell: bash
6053
run: sudo apt-get update && sudo apt-get install -y libcurl4-openssl-dev
61-
- name: Start MinIO
62-
shell: bash
63-
run: bash ci/scripts/start_minio.sh
6454
- name: Build Iceberg
6555
shell: bash
6656
env:
@@ -79,21 +69,11 @@ jobs:
7969
timeout-minutes: 30
8070
strategy:
8171
fail-fast: false
82-
env:
83-
ICEBERG_TEST_S3_URI: s3://iceberg-test
84-
AWS_ACCESS_KEY_ID: minio
85-
AWS_SECRET_ACCESS_KEY: minio123
86-
AWS_DEFAULT_REGION: us-east-1
87-
AWS_ENDPOINT_URL: http://127.0.0.1:9000
88-
AWS_EC2_METADATA_DISABLED: "TRUE"
8972
steps:
9073
- name: Checkout iceberg-cpp
91-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
74+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
9275
with:
9376
persist-credentials: false
94-
- name: Start MinIO
95-
shell: bash
96-
run: bash ci/scripts/start_minio.sh
9777
- name: Build Iceberg
9878
shell: bash
9979
run: ci/scripts/build_iceberg.sh $(pwd)
@@ -106,41 +86,35 @@ jobs:
10686
timeout-minutes: 60
10787
strategy:
10888
fail-fast: false
109-
env:
110-
ICEBERG_TEST_S3_URI: s3://iceberg-test
111-
AWS_ACCESS_KEY_ID: minio
112-
AWS_SECRET_ACCESS_KEY: minio123
113-
AWS_DEFAULT_REGION: us-east-1
114-
AWS_ENDPOINT_URL: http://127.0.0.1:9000
115-
AWS_EC2_METADATA_DISABLED: "TRUE"
11689
steps:
11790
- name: Checkout iceberg-cpp
118-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
91+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
11992
with:
12093
persist-credentials: false
94+
- name: Set up MSVC Developer Command Prompt
95+
uses: ilammy/msvc-dev-cmd@0b201ec74fa43914dc39ae48a89fd1d8cb592756 # v1.13.0
96+
with:
97+
arch: x64
12198
- name: Install dependencies
12299
shell: pwsh
123100
run: |
124101
vcpkg install zlib:x64-windows nlohmann-json:x64-windows nanoarrow:x64-windows roaring:x64-windows cpr:x64-windows
125102
- name: Setup sccache
126-
uses: mozilla-actions/sccache-action@7d986dd989559c6ecdb630a3fd2557667be217ad # v0.0.9
127-
- name: Start MinIO
128-
shell: bash
129-
run: bash ci/scripts/start_minio.sh
103+
uses: mozilla-actions/sccache-action@9e7fa8a12102821edf02ca5dbea1acd0f89a2696 # v0.0.10
130104
- name: Build Iceberg
131105
shell: pwsh
132106
env:
133107
SCCACHE_GHA_ENABLED: "true"
134108
run: |
135109
$ErrorActionPreference = "Stop"
136-
cmd /c "call `"C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat`" x64 && bash -lc `"ci/scripts/build_iceberg.sh `$(pwd) OFF ON`""
110+
bash -lc 'ci/scripts/build_iceberg.sh $(pwd) OFF ON'
137111
if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
138112
sccache --show-stats
139113
- name: Build Example
140114
shell: pwsh
141115
run: |
142116
$ErrorActionPreference = "Stop"
143-
cmd /c "call `"C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat`" x64 && bash -lc `"ci/scripts/build_example.sh `$(pwd)/example`""
117+
bash -lc 'ci/scripts/build_example.sh $(pwd)/example'
144118
meson:
145119
name: Meson - ${{ matrix.title }}
146120
runs-on: ${{ matrix.runs-on }}
@@ -161,11 +135,11 @@ jobs:
161135
- title: AArch64 macOS 26
162136
runs-on: macos-26
163137
steps:
164-
- uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6
138+
- uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
165139
with:
166140
python-version: '3.x'
167141
- name: Checkout iceberg-cpp
168-
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
142+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
169143
with:
170144
persist-credentials: false
171145
- name: Install build dependencies

0 commit comments

Comments
 (0)