ci: cxx_modules added to CI matrix

This commit is contained in:
Mateusz Pusz
2024-01-08 14:08:58 +01:00
parent ffc8b6bd0d
commit b65854d8f3
2 changed files with 13 additions and 5 deletions

View File

@@ -64,6 +64,7 @@ jobs:
cc: "gcc-12",
cxx: "g++-12",
},
cxx_modules: False,
conan-config: "",
}
- {
@@ -76,6 +77,7 @@ jobs:
cc: "gcc-13",
cxx: "g++-13",
},
cxx_modules: False,
conan-config: "",
}
- {
@@ -89,6 +91,7 @@ jobs:
cxx: "clang++-16",
},
lib: "libc++",
cxx_modules: False,
conan-config: "",
}
- {
@@ -102,7 +105,8 @@ jobs:
cxx: "clang++-17",
},
lib: "libc++",
conan-config: "-o cxx_modules=True",
cxx_modules: True,
conan-config: "",
}
- {
name: "Apple Clang 15",
@@ -114,6 +118,7 @@ jobs:
cc: "clang",
cxx: "clang++",
},
cxx_modules: False,
conan-config: "",
}
build_type: ["Release", "Debug"]
@@ -194,7 +199,7 @@ jobs:
run: |
conan create . --user mpusz --channel ${CHANNEL} --lockfile-out=package.lock \
-b mp-units/* -b missing -c tools.cmake.cmaketoolchain:generator="Ninja Multi-Config" \
-c user.build:all=True ${{ matrix.config.conan-config }}
-c user.build:all=True -o cxx_modules=${{ matrix.config.cxx_modules }} ${{ matrix.config.conan-config }}
- name: Obtain package reference
id: get-package-ref
shell: bash

View File

@@ -63,6 +63,7 @@ jobs:
cc: "gcc-12",
cxx: "g++-12",
},
cxx_modules: False,
}
- {
name: "GCC-13",
@@ -74,6 +75,7 @@ jobs:
cc: "gcc-13",
cxx: "g++-13",
},
cxx_modules: False,
}
- {
name: "Clang-16",
@@ -86,6 +88,7 @@ jobs:
cxx: "clang++-16",
},
lib: "libc++",
cxx_modules: False,
}
- {
name: "Clang-17",
@@ -98,7 +101,7 @@ jobs:
cxx: "clang++-17",
},
lib: "libc++",
conan-config: "-o cxx_modules=True",
cxx_modules: True,
}
- {
name: "Apple Clang 15",
@@ -110,7 +113,7 @@ jobs:
cc: "clang",
cxx: "clang++",
},
conan-config: "",
cxx_modules: False,
}
build_type: ["Release", "Debug"]
@@ -188,7 +191,7 @@ jobs:
- name: Install Conan dependencies
shell: bash
run: |
conan install . -b missing -c tools.cmake.cmaketoolchain:generator="Ninja Multi-Config" -c user.build:all=False
conan install . -b missing -c tools.cmake.cmaketoolchain:generator="Ninja Multi-Config" -c user.build:all=False -o cxx_modules=${{ matrix.config.cxx_modules }}
mv CMakeUserPresets.json src
- name: Configure mp-units CMake
if: matrix.config.compiler.type == 'VISUAL' || matrix.config.compiler.type == 'MSVC'