diff --git a/.cirrus.yml b/.cirrus.yml deleted file mode 100644 index c7f4c15e2..000000000 --- a/.cirrus.yml +++ /dev/null @@ -1,17 +0,0 @@ -arm_container: - image: gcc:latest - -check_task: - check_script: - # the gcc image ships an outdated CMake, so fetch a recent prebuilt binary - # instead of compiling CMake from source - - wget -q https://github.com/Kitware/CMake/releases/download/v4.3.4/cmake-4.3.4-linux-aarch64.tar.gz - - tar xfz cmake-4.3.4-linux-aarch64.tar.gz - - export PATH="$(pwd)/cmake-4.3.4-linux-aarch64/bin:$PATH" - - cmake --version - - mkdir build - - cd build - - cmake .. -DJSON_FastTests=ON - - make -j4 - - cd tests - - ctest -j4 diff --git a/.github/workflows/ubuntu.yml b/.github/workflows/ubuntu.yml index d8c27c621..44d373b16 100644 --- a/.github/workflows/ubuntu.yml +++ b/.github/workflows/ubuntu.yml @@ -403,3 +403,21 @@ jobs: run: cmake -S . -B build -DJSON_CI=On - name: Build run: cmake --build build --target ${{ matrix.target }} + + # Native Linux ARM64 runner with the latest GCC. The ubuntu-24.04-arm label is + # only available for public repositories. + ci_test_arm64: + runs-on: ubuntu-24.04-arm + container: gcc:latest + steps: + - uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1 + with: + persist-credentials: false + - name: Get latest CMake and ninja + uses: lukka/get-cmake@fffaaafeea488556c2c12dad60690008bc1caacb # v4.4.2 + - name: Check that the job runs natively on arm64 + run: uname -m && test "$(uname -m)" = aarch64 + - name: Run CMake + run: cmake -S . -B build -DJSON_CI=On + - name: Build + run: cmake --build build --target ci_test_compiler_default diff --git a/FILES.md b/FILES.md index 263647146..d13be1238 100644 --- a/FILES.md +++ b/FILES.md @@ -33,17 +33,6 @@ Further documentation: > [!IMPORTANT] > The folder `.github/workflows` is predetermined by GitHub. -### `.cirrus.yml` - -Configuration file for the pipeline at [Cirrus CI](https://cirrus-ci.com/github/nlohmann/json). - -Further documentation: - -- [Writing tasks](https://cirrus-ci.org/guide/writing-tasks/) - -> [!IMPORTANT] -> The filename `.cirrus.yml` and position (root of the repository) are predetermined by Cirrus CI. - ### `.github/external_ci/appveyor.yml` Configuration for the pipelines at [AppVeyor](https://ci.appveyor.com/project/nlohmann/json). diff --git a/README.md b/README.md index cc3546686..c298e6135 100644 --- a/README.md +++ b/README.md @@ -7,7 +7,6 @@ [![Coverage Status](https://coveralls.io/repos/github/nlohmann/json/badge.svg?branch=develop)](https://coveralls.io/github/nlohmann/json?branch=develop) [![Coverity Scan Build Status](https://scan.coverity.com/projects/5550/badge.svg)](https://scan.coverity.com/projects/nlohmann-json) [![Codacy Badge](https://app.codacy.com/project/badge/Grade/e0d1a9d5d6fd46fcb655c4cb930bb3e8)](https://app.codacy.com/gh/nlohmann/json/dashboard?utm_source=gh&utm_medium=referral&utm_content=&utm_campaign=Badge_grade) -[![Cirrus CI](https://api.cirrus-ci.com/github/nlohmann/json.svg)](https://cirrus-ci.com/github/nlohmann/json) [![Fuzzing Status](https://oss-fuzz-build-logs.storage.googleapis.com/badges/json.svg)](https://bugs.chromium.org/p/oss-fuzz/issues/list?sort=-opened&can=1&q=proj:json) [![Try online](https://img.shields.io/badge/try-online-blue.svg)](https://wandbox.org/permlink/1mp10JbaANo6FUc7) [![Documentation](https://img.shields.io/badge/docs-mkdocs-blue.svg)](https://json.nlohmann.me) diff --git a/docs/mkdocs/docs/community/quality_assurance.md b/docs/mkdocs/docs/community/quality_assurance.md index 794021979..d44135bf2 100644 --- a/docs/mkdocs/docs/community/quality_assurance.md +++ b/docs/mkdocs/docs/community/quality_assurance.md @@ -90,7 +90,7 @@ Note: Some modern features (like C++20 ranges or filesystem support) may be disa | GNU 14.2.0 | x86_64 | Ubuntu 22.04.1 LTS | GitHub | | GNU 15.1.0 | x86_64 | Ubuntu 22.04.1 LTS | GitHub | | GNU 16.1.0 | x86_64 | Ubuntu 22.04.1 LTS | GitHub | - | GNU 16.1.0 | arm64 | Linux 6.1.100 | Cirrus CI | + | GNU 16.1.0 | arm64 | Ubuntu 24.04 | GitHub | | icpc (ICC) 2021.10.0 20230609 | x86_64 | Ubuntu 22.04 LTS | GitHub | | icpx (Intel oneAPI DPC++/C++) 2025.3.2 | x86_64 | Ubuntu 24.04 LTS | GitHub | | nvc++ (NVIDIA HPC SDK) 25.5-0 | x86_64 | Ubuntu 22.04 LTS | GitHub |