Skip to content

Add CI build, tests for Linux/arm64 and migrate to jsoncons csv-parser #307

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nihalzp merged 6 commits into from
Oct 15, 2025
Merged

Add CI build, tests for Linux/arm64 and migrate to jsoncons csv-parser #307

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e365fcb
Add support for linux/arm64
nihalzp Oct 14, 2025
4be0d5a
Make csv parsing portable
nihalzp Oct 14, 2025
e5b8819
Ignore .venv folder family
nihalzp Oct 15, 2025
22285fc
Use jsoncons for csv parsing
nihalzp Oct 15, 2025
0623a6f
Add jsoncons as conanfile dependency
nihalzp Oct 15, 2025
eb11ea1
Fix style
nihalzp Oct 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
59 changes: 37 additions & 22 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,17 @@ jobs:
version: 16
build_type: Debug
name: ubuntu-debug-clang
# Linux arm
- os: ubuntu-24.04-arm
compiler: clang
version: 16
build_type: Release
name: ubuntu-arm64-release-clang
- os: ubuntu-24.04-arm
compiler: clang
version: 16
build_type: Debug
name: ubuntu-arm64-debug-clang
# macOS
- os: macos-14
compiler: apple-clang
Expand Down Expand Up @@ -270,17 +281,19 @@ jobs:
strategy:
fail-fast: false
matrix:
target:
- ubuntu-release-gcc
- ubuntu-release-clang
- ubuntu-debug-gcc
- ubuntu-debug-clang
- macos-release-appleclang
- macos-debug-appleclang
- asan
- ubsan
- tsan
runs-on: "${{ contains(matrix.target, 'mac') && 'macos-14' || 'ubuntu-latest' }}"
include:
- { target: ubuntu-release-gcc, os: ubuntu-latest }
- { target: ubuntu-release-clang, os: ubuntu-latest }
- { target: ubuntu-debug-gcc, os: ubuntu-latest }
- { target: ubuntu-debug-clang, os: ubuntu-latest }
- { target: ubuntu-arm64-release-clang, os: ubuntu-24.04-arm }
- { target: ubuntu-arm64-debug-clang, os: ubuntu-24.04-arm }
- { target: macos-release-appleclang, os: macos-14 }
- { target: macos-debug-appleclang, os: macos-14 }
- { target: asan, os: ubuntu-latest }
- { target: ubsan, os: ubuntu-latest }
- { target: tsan, os: ubuntu-latest }
runs-on: ${{ matrix.os }}

steps:
- uses: actions/download-artifact@v4
Expand All @@ -301,17 +314,19 @@ jobs:
strategy:
fail-fast: false
matrix:
target:
- ubuntu-release-gcc
- ubuntu-release-clang
- ubuntu-debug-gcc
- ubuntu-debug-clang
- macos-release-appleclang
- macos-debug-appleclang
- asan
- ubsan
- tsan
runs-on: "${{ contains(matrix.target, 'mac') && 'macos-14' || 'ubuntu-latest' }}"
include:
- { target: ubuntu-release-gcc, os: ubuntu-latest }
- { target: ubuntu-release-clang, os: ubuntu-latest }
- { target: ubuntu-debug-gcc, os: ubuntu-latest }
- { target: ubuntu-debug-clang, os: ubuntu-latest }
- { target: ubuntu-arm64-release-clang, os: ubuntu-24.04-arm }
- { target: ubuntu-arm64-debug-clang, os: ubuntu-24.04-arm }
- { target: macos-release-appleclang, os: macos-14 }
- { target: macos-debug-appleclang, os: macos-14 }
- { target: asan, os: ubuntu-latest }
- { target: ubsan, os: ubuntu-latest }
- { target: tsan, os: ubuntu-latest }
runs-on: ${{ matrix.os }}

steps:
- uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,4 +101,4 @@ Makefile

# Ignore Python virtual environment
venv
.venv
.venv*
3 changes: 3 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ find_package(argparse REQUIRED CONFIG)
find_package(vincentlaucsb-csv-parser REQUIRED CONFIG)
find_package(indicators REQUIRED CONFIG)
find_package(PkgConfig REQUIRED)
find_package(jsoncons REQUIRED)

pkg_search_module(FFTW REQUIRED IMPORTED_TARGET fftw3)

# ----------------------------- Cartogram Library ---------------------------
Expand All @@ -36,6 +38,7 @@ target_link_libraries(cartogram_lib
vincentlaucsb-csv-parser::vincentlaucsb-csv-parser
indicators::indicators
PkgConfig::FFTW
jsoncons
)

if(CMAKE_BUILD_TYPE STREQUAL Release)
Expand Down
1 change: 1 addition & 0 deletions conanfile.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ nlohmann_json/3.11.3
boost/1.83.0
fftw/3.3.10
pkgconf/2.2.0
jsoncons/1.3.0

[tool_requires]
pkgconf/2.2.0
Expand Down
Loading