Fix CI and build with modern cmake

.github/workflows/ci.yml

@@ -1,73 +1,48 @@
 name: CI
 on: [push, pull_request]
 
-jobs:
-  # Here we're keeping on arbitrary LLVM version fixed and varying GCC.
-  linux-gcc:
-    strategy:
-      fail-fast: false
-      matrix:
-        image:
-          # List: https://github.com/conan-io/conan-docker-tools
-          - gcc10
-          - gcc9
-          - gcc8
-          - gcc7
-          - gcc6
-
-    runs-on: ubuntu-latest
-    container:
-      image: conanio/${{matrix.image}}
-      options: --user root
-
-    steps:
-    - uses: actions/checkout@v2
-    - name: Create Build Environment
-      run: cmake -E make_directory build
-    - name: Install libclang
-      run: apt-get -qq update && apt-get install -y llvm clang libclang-dev
-    - name: Install ninja
-      run: type ninja || apt-get install -y ninja-build
+concurrency:
+  group: ci-${{ github.ref }}
+  cancel-in-progress: true
 
-    - name: Configure
-      working-directory: build/
-      run: cmake -GNinja $GITHUB_WORKSPACE
-    - name: Build
-      working-directory: build/
-      run: cmake --build .
-    - name: Test
-      working-directory: build/
-      run: ctest --output-on-failure
-
-  # Here we're varying the LLVM version and using its clang for compiling as well.
-  linux-clang:
+jobs:
+  test:
+    runs-on: ${{ matrix.on }}
     strategy:
-      fail-fast: false
       matrix:
-        version: [7, 8, 9, 10]
-
-    runs-on: ubuntu-latest
-    container:
-      # Just one of the newer images.
-      image: conanio/gcc10
-      options: --user root
+        include:
+        - { environment: "llvm-15", on: "ubuntu-24.04" }
+        - { environment: "llvm-16", on: "ubuntu-24.04" }
+        - { environment: "llvm-17", on: "ubuntu-24.04" }
+        - { environment: "llvm-18", on: "ubuntu-24.04" }
+        - { environment: "llvm-19", on: "ubuntu-24.04" }
+        - { environment: "llvm-20", on: "ubuntu-24.04" }
+        - { environment: "llvm-21", on: "ubuntu-24.04" }
+        - { environment: "llvm-22", on: "ubuntu-24.04" }
+        # The Xcode 16.x SDK is not compatible with such an old clang
+        # - { environment: "llvm-15", on: "macos-15" }
+        # - { environment: "llvm-16", on: "macos-15" }
+        # - { environment: "llvm-17", on: "macos-15" }
+        # - { environment: "llvm-18", on: "macos-15" }
+        - { environment: "llvm-19", on: "macos-15" }
+        # conda cannot solve for clangdev=20,21,22 on Silicon
+        # - { environment: "llvm-20", on: "macos-15" }
+        # - { environment: "llvm-21", on: "macos-15" }
+        # - { environment: "llvm-22", on: "macos-15" }
+        # The Xcode 16.x SDK is not compatible with such an old clang
+        # - { environment: "llvm-15", on: "macos-15-intel" }
+        # - { environment: "llvm-16", on: "macos-15-intel" }
+        # - { environment: "llvm-17", on: "macos-15-intel" }
+        # - { environment: "llvm-18", on: "macos-15-intel" }
+        - { environment: "llvm-19", on: "macos-15-intel" }
+        - { environment: "llvm-20", on: "macos-15-intel" }
+        - { environment: "llvm-21", on: "macos-15-intel" }
+        - { environment: "llvm-22", on: "macos-15-intel" }
 
     steps:
-    - uses: actions/checkout@v2
-    - name: Create Build Environment
-      run: cmake -E make_directory build
-    - name: Install libclang
-      run: apt-get -qq update && apt-get install -y llvm-${{matrix.version}} clang-${{matrix.version}} libclang-${{matrix.version}}-dev
-    - name: Install ninja
-      run: type ninja || apt-get install -y ninja-build
-
-    - name: Configure
-      working-directory: build/
-      run: cmake -GNinja $GITHUB_WORKSPACE -DCMAKE_CXX_COMPILER=clang++-${{matrix.version}}
-    - name: Build
-      working-directory: build/
-      run: cmake --build .
-    - name: Test
-      working-directory: build/
-      run: ctest --output-on-failure
-
+    - uses: actions/checkout@v5
+      with: { submodules: recursive }
+    - uses: prefix-dev/setup-pixi@v0.9.4
+      with: { pixi-version: v0.68.0 }
+    - name: run tests
+      run: pixi run -e ${{ matrix.environment }} test

.gitignore

@@ -0,0 +1,2 @@
+/build
+/Testing

CMakeLists.txt

@@ -2,7 +2,7 @@
 # SPDX-License-Identifier: MIT
 # found in the top-level directory of this distribution.
 
-cmake_minimum_required(VERSION 3.11)
+cmake_minimum_required(VERSION 4.0)
 project(cppast VERSION 0.1.0)
 
 if(CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)

README.md

@@ -40,12 +40,12 @@ TODO, refer to documentation comments in header file.
 
 ### Installation
 
-The library can be used as CMake subdirectory, download it and call `add_subdirectory(path/to/cppast)`, then link to the `cppast` target and enable C++11 or higher.
+For development, we recommend to use [pixi](https://pixi.sh). Run `pixi run build` to compile the package, `pixi run test` to run its test suite, `pixi run cppast` to run the cppast tool.
 
-The parser needs `libclang` and the `clang++` binary, at least version 4.0.0.
-The `clang++` binary will be found in `PATH` and in the same directory as the program that is being executed.
+The library can also be used as CMake subdirectory, download it and call `add_subdirectory(path/to/cppast)`, then link to the `cppast` target and enable C++11 or higher.
 
-*Note: The project will drop support for older LLVM versions very soon; this minimizes the workaround code when the `libclang` API catches up.*
+The parser needs `libclang` and the `clang++` binary, at least version 15.
+The `clang++` binary will be found in `PATH` and in the same directory as the program that is being executed.
 
 The CMake code requires `llvm-config`, you may need to install `llvm` and not just `clang` to get it (e.g. on ArchLinux).
 If `llvm-config` is in your path and the version is compatible, it should just work out of the box.

external/external.cmake

@@ -31,7 +31,7 @@ if(build_tool)
     set(CXXOPTS_BUILD_TESTS OFF CACHE BOOL "")
 
     message(STATUS "Fetching cxxopts")
-    FetchContent_Declare(cxxopts URL https://github.com/jarro2783/cxxopts/archive/v2.2.1.zip)
+    FetchContent_Declare(cxxopts GIT_REPOSITORY https://github.com/jarro2783/cxxopts GIT_TAG origin/master)
     FetchContent_MakeAvailable(cxxopts)
 endif()
 

external/tpl/CMakeLists.txt

@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 4.0)
 
 project(tiny-process-library)
 

include/cppast/compile_config.hpp

@@ -168,6 +168,11 @@ class compile_config
         return do_use_c();
     }
 
+    void add_flag(std::string flag)
+    {
+        flags_.push_back(std::move(flag));
+    }
+
 protected:
     compile_config(std::vector<std::string> def_flags) : flags_(std::move(def_flags)) {}
 
@@ -176,11 +181,6 @@ class compile_config
 
     ~compile_config() noexcept = default;
 
-    void add_flag(std::string flag)
-    {
-        flags_.push_back(std::move(flag));
-    }
-
     const std::vector<std::string>& get_flags() const noexcept
     {
         return flags_;

include/cppast/cpp_entity_index.hpp

@@ -46,7 +46,7 @@ struct cpp_entity_id : type_safe::strong_typedef<cpp_entity_id, detail::hash_typ
 inline namespace literals
 {
     /// \returns A new [cppast::cpp_entity_id]() created from the given string.
-    inline cpp_entity_id operator"" _id(const char* str, std::size_t)
+    inline cpp_entity_id operator""_id(const char* str, std::size_t)
     {
         return cpp_entity_id(str);
     }