Skip to content

Commit ac01e98

Browse files
committed
fix some ci
1 parent a11a619 commit ac01e98

File tree

5 files changed

+13
-23
lines changed

5 files changed

+13
-23
lines changed

.github/workflows/cpp-linter.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,6 @@ jobs:
4848
continue-on-error: true
4949
env:
5050
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
51-
CC: gcc-14
52-
CXX: g++-14
5351
with:
5452
style: file
5553
tidy-checks: ''

.github/workflows/rc.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,6 @@ jobs:
8181
- os: ubuntu-24.04
8282
CC: gcc-14
8383
CXX: g++-14
84-
env:
85-
CC: ${{ matrix.CC || 'cc' }}
86-
CXX: ${{ matrix.CXX || 'c++' }}
8784
steps:
8885
- name: Checkout
8986
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
@@ -92,6 +89,12 @@ jobs:
9289
with:
9390
name: archive
9491

92+
- name: Set Ubuntu Compilers
93+
if: ${{ startsWith(matrix.runs-on, 'ubuntu') }}
94+
run: |
95+
echo "CC=${{ matrix.CC }}" >> $GITHUB_ENV
96+
echo "CXX=${{ matrix.CXX }}" >> $GITHUB_ENV
97+
9598
- name: Verify
9699
run: |
97100
tar_gz=$(echo apache-iceberg-cpp-*.tar.gz)

.github/workflows/test.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -115,9 +115,6 @@ jobs:
115115
meson-setup-args: --vsenv
116116
- title: AArch64 macOS 26
117117
runs-on: macos-26
118-
env:
119-
CC: ${{ matrix.CC || 'cc' }}
120-
CXX: ${{ matrix.CXX || 'c++' }}
121118
steps:
122119
- uses: actions/setup-python@v6
123120
with:
@@ -128,6 +125,11 @@ jobs:
128125
run: |
129126
python3 -m pip install --upgrade pip
130127
python3 -m pip install -r requirements.txt
128+
- name: Set Ubuntu Compilers
129+
if: ${{ startsWith(matrix.runs-on, 'ubuntu') }}
130+
run: |
131+
echo "CC=${{ matrix.CC }}" >> $GITHUB_ENV
132+
echo "CXX=${{ matrix.CXX }}" >> $GITHUB_ENV
131133
- name: Build Iceberg
132134
run: |
133135
meson setup builddir ${{ matrix.meson-setup-args || '' }}

cmake_modules/IcebergThirdpartyToolchain.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,7 @@ function(resolve_croaring_dependency)
324324
set(CROARING_URL "$ENV{ICEBERG_CROARING_URL}")
325325
else()
326326
set(CROARING_URL
327-
"https://github.com/RoaringBitmap/CRoaring/archive/refs/tags/v4.3.11.tar.gz")
327+
"https://github.com/RoaringBitmap/CRoaring/archive/refs/tags/v4.4.3.tar.gz")
328328
endif()
329329

330330
fetchcontent_declare(croaring
@@ -543,7 +543,7 @@ function(resolve_cpr_dependency)
543543
RUNTIME DESTINATION "${ICEBERG_INSTALL_BINDIR}"
544544
ARCHIVE DESTINATION "${ICEBERG_INSTALL_LIBDIR}"
545545
LIBRARY DESTINATION "${ICEBERG_INSTALL_LIBDIR}")
546-
list(APPEND ICEBERG_SYSTEM_DEPENDENCIES OpenSSL)
546+
list(APPEND ICEBERG_SYSTEM_DEPENDENCIES OpenSSL CURL)
547547
else()
548548
set(CPR_VENDORED FALSE)
549549
list(APPEND ICEBERG_SYSTEM_DEPENDENCIES cpr)

src/iceberg/iceberg-config.cmake.in

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -72,19 +72,6 @@ endmacro()
7272
# Find system dependencies
7373
iceberg_find_dependencies("${ICEBERG_SYSTEM_DEPENDENCIES}")
7474

75-
# Create missing CRoaring targets if they don't exist
76-
if(NOT TARGET roaring::roaring-headers)
77-
add_library(roaring::roaring-headers INTERFACE IMPORTED)
78-
endif()
79-
80-
if(NOT TARGET roaring::roaring-headers-cpp)
81-
add_library(roaring::roaring-headers-cpp INTERFACE IMPORTED)
82-
endif()
83-
84-
if(NOT TARGET CURL::libcurl)
85-
add_library(CURL::libcurl INTERFACE IMPORTED)
86-
endif()
87-
8875
include("${CMAKE_CURRENT_LIST_DIR}/iceberg-targets.cmake")
8976

9077
if(TARGET iceberg::arrow_static)

0 commit comments

Comments
 (0)