From e7f18308b49529f8376ab178217c821146036873 Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Tue, 27 May 2025 16:50:55 +0200 Subject: [PATCH 1/3] :construction: add nvcc Signed-off-by: Niels Lohmann --- .github/workflows/ubuntu.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index 9ebe45b914..b8e43a0e12 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -266,6 +266,18 @@ jobs: - name: Build run: cmake --build build + ci_nvcc: + runs-on: ubuntu-latest + container: nvidia/cuda:12.9.0-devel-ubuntu24.04 + steps: + - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - name: Run CMake + run: CXX=nvcc cmake -S . -B build -D CMAKE_BUILD_TYPE=Debug -DJSON_BuildTests=On -DJSON_FastTests=ON + - name: Build + run: cmake --build build --parallel 10 + - name: Test + run: cd build ; ctest -j 10 --output-on-failure + ci_test_documentation: runs-on: ubuntu-latest strategy: From 5b52e5d8ff8ab7cb2dcdbb9a2fc63696f2b71167 Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Tue, 27 May 2025 18:03:08 +0200 Subject: [PATCH 2/3] :construction: add nvcc Signed-off-by: Niels Lohmann --- .github/workflows/ubuntu.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index b8e43a0e12..4c2b276158 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -271,6 +271,8 @@ jobs: container: nvidia/cuda:12.9.0-devel-ubuntu24.04 steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 + - name: Get latest CMake and ninja + uses: lukka/get-cmake@ea004816823209b8d1211e47b216185caee12cc5 # v4.02 - name: Run CMake run: CXX=nvcc cmake -S . -B build -D CMAKE_BUILD_TYPE=Debug -DJSON_BuildTests=On -DJSON_FastTests=ON - name: Build From dede2cf6a292ca42e10afad1bd6a7b16bcf2c5e3 Mon Sep 17 00:00:00 2001 From: Niels Lohmann Date: Tue, 27 May 2025 19:02:47 +0200 Subject: [PATCH 3/3] :construction: add nvcc Signed-off-by: Niels Lohmann --- tests/CMakeLists.txt | 4 ++-- tests/abi/CMakeLists.txt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index b1dc5df104..c3cde40ec3 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -75,8 +75,8 @@ target_compile_options(test_main PUBLIC # https://github.com/nlohmann/json/pull/3229 $<$:-diag-disable=2196> - $<$>:-Wno-deprecated;-Wno-float-equal> - $<$:-Wno-deprecated-declarations> + $<$:-Wno-deprecated-declarations;-Wno-deprecated;-Wno-float-equal> + $<$:-Wno-deprecated-declarations;-Wno-deprecated;-Wno-float-equal> $<$:-diag-disable=1786>) target_include_directories(test_main PUBLIC thirdparty/doctest diff --git a/tests/abi/CMakeLists.txt b/tests/abi/CMakeLists.txt index ba90837cb0..83c311318b 100644 --- a/tests/abi/CMakeLists.txt +++ b/tests/abi/CMakeLists.txt @@ -12,8 +12,8 @@ target_compile_options(abi_compat_common INTERFACE # https://github.com/nlohmann/json/pull/3229 $<$:-diag-disable=2196> - $<$>:-Wno-deprecated;-Wno-float-equal> - $<$:-Wno-deprecated-declarations> + $<$:-Wno-deprecated-declarations;-Wno-deprecated;-Wno-float-equal> + $<$:-Wno-deprecated-declarations;-Wno-deprecated;-Wno-float-equal> $<$:-diag-disable=1786>) target_include_directories(abi_compat_common SYSTEM INTERFACE ../thirdparty/doctest