Skip to content

Commit bbc83d3

Browse files
committed
Merge remote-tracking branch 'upstream/main' into add-contributing-doc
2 parents ea2e3d2 + 6f1cdfd commit bbc83d3

66 files changed

Lines changed: 2900 additions & 375 deletions

Some content is hidden

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

.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@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
37+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
3838
- name: Install dependencies
3939
shell: bash
4040
run: sudo apt-get update && sudo apt-get install -y libcurl4-openssl-dev

.github/workflows/docs.yml

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
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+
118
name: "Release Docs"
219

320
on:
@@ -20,7 +37,7 @@ jobs:
2037
runs-on: ubuntu-24.04
2138

2239
steps:
23-
- uses: actions/checkout@v6.0.1
40+
- uses: actions/checkout@v6.0.2
2441
with:
2542
fetch-depth: 1
2643

.github/workflows/license_check.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
runs-on: ubuntu-24.04
2626
steps:
2727
- name: Checkout repository
28-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
28+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
2929
- name: Check license header
3030
uses: apache/skywalking-eyes@main
3131
env:

.github/workflows/pre-commit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,6 @@ jobs:
2828
pre-commit:
2929
runs-on: ubuntu-24.04
3030
steps:
31-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
31+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
3232
- uses: actions/setup-python@v6
3333
- uses: pre-commit/action@2c7b3805fd2a0fd8c1884dcaebf91fc102a13ecd # v3.0.1

.github/workflows/rc.yml

Lines changed: 10 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@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
37+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
3838

3939
- name: Prepare for tag
4040
if: github.ref_type == 'tag'
@@ -83,18 +83,23 @@ jobs:
8383
CXX: g++-14
8484
steps:
8585
- name: Checkout
86-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
86+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
8787

8888
- uses: actions/download-artifact@v7
8989
with:
9090
name: archive
9191

92-
- name: Set Ubuntu Compilers
93-
if: ${{ startsWith(matrix.runs-on, 'ubuntu') }}
92+
- name: Set compilers on Ubuntu
93+
if: ${{ startsWith(matrix.os, 'ubuntu') }}
9494
run: |
9595
echo "CC=${{ matrix.CC }}" >> $GITHUB_ENV
9696
echo "CXX=${{ matrix.CXX }}" >> $GITHUB_ENV
9797
98+
- name: Install dependencies on Ubuntu
99+
if: ${{ startsWith(matrix.os, 'ubuntu') }}
100+
shell: bash
101+
run: sudo apt-get update && sudo apt-get install -y libcurl4-openssl-dev
102+
98103
- name: Verify
99104
run: |
100105
tar_gz=$(echo apache-iceberg-cpp-*.tar.gz)
@@ -124,7 +129,7 @@ jobs:
124129
contents: write
125130
steps:
126131
- name: Checkout
127-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
132+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
128133

129134
- uses: actions/download-artifact@v7
130135
with:

.github/workflows/sanitizer_test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ jobs:
4141
fail-fast: false
4242
steps:
4343
- name: Checkout iceberg-cpp
44-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
44+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
4545
- name: Install dependencies
4646
shell: bash
4747
run: sudo apt-get update && sudo apt-get install -y libcurl4-openssl-dev

.github/workflows/test.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
fail-fast: false
4646
steps:
4747
- name: Checkout iceberg-cpp
48-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
48+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
4949
- name: Install dependencies
5050
shell: bash
5151
run: sudo apt-get update && sudo apt-get install -y libcurl4-openssl-dev
@@ -69,7 +69,7 @@ jobs:
6969
fail-fast: false
7070
steps:
7171
- name: Checkout iceberg-cpp
72-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
72+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
7373
- name: Build Iceberg
7474
shell: bash
7575
run: ci/scripts/build_iceberg.sh $(pwd)
@@ -84,7 +84,7 @@ jobs:
8484
fail-fast: false
8585
steps:
8686
- name: Checkout iceberg-cpp
87-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
87+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
8888
- name: Install dependencies
8989
shell: cmd
9090
run: |
@@ -127,7 +127,7 @@ jobs:
127127
with:
128128
python-version: '3.x'
129129
- name: Checkout iceberg-cpp
130-
uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
130+
uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
131131
- name: Install build dependencies
132132
run: |
133133
python3 -m pip install --upgrade pip

CMakeLists.txt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,12 @@ endif()
2424
list(PREPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules")
2525

2626
project(Iceberg
27-
VERSION 0.2.0
27+
VERSION 0.3.0
2828
DESCRIPTION "Iceberg C++ Project"
2929
LANGUAGES CXX)
3030

31+
set(ICEBERG_VERSION_SUFFIX "-SNAPSHOT")
32+
set(ICEBERG_VERSION_STRING "${PROJECT_VERSION}${ICEBERG_VERSION_SUFFIX}")
3133
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/src/iceberg/version.h.in"
3234
"${CMAKE_BINARY_DIR}/src/iceberg/version.h")
3335

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ This product includes code from Apache Arrow.
222222
* cmake_modules/IcebergBuildUtils.cmake.
223223
* cmake_modules/IcebergThirdpartyToolchain.cmake.
224224

225-
Copyright: 2016-2025 The Apache Software Foundation.
225+
Copyright: 2016-2026 The Apache Software Foundation.
226226
Home page: https://arrow.apache.org/
227227
License: https://www.apache.org/licenses/LICENSE-2.0
228228

NOTICE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Apache Iceberg C++
2-
Copyright 2024-2025 The Apache Software Foundation
2+
Copyright 2024-2026 The Apache Software Foundation
33

44
This product includes software developed at
55
The Apache Software Foundation (http://www.apache.org/).

0 commit comments

Comments
 (0)