mirror of
https://github.com/mpusz/mp-units.git
synced 2025-08-03 20:34:26 +02:00
ci: MSVC added to the CI
This commit is contained in:
28
.github/workflows/ci-conan.yml
vendored
28
.github/workflows/ci-conan.yml
vendored
@@ -44,18 +44,14 @@ jobs:
|
|||||||
contracts: ["none", "gsl-lite", "ms-gsl"]
|
contracts: ["none", "gsl-lite", "ms-gsl"]
|
||||||
std: [20, 23]
|
std: [20, 23]
|
||||||
config:
|
config:
|
||||||
# - {
|
- {
|
||||||
# name: "MSVC 14.2",
|
name: "MSVC 14.4",
|
||||||
# os: windows-2019,
|
os: windows-2022,
|
||||||
# compiler: { type: VISUAL, version: 16, cc: "", cxx: "" },
|
compiler: { type: MSVC, version: 194, cc: "", cxx: "" },
|
||||||
# conan-config: "-c user.mp-units.build:skip_la=True",
|
cxx_modules: "False",
|
||||||
# }
|
std_format_support: "True",
|
||||||
# - {
|
conan-config: "",
|
||||||
# name: "MSVC 14.3",
|
}
|
||||||
# os: windows-2022,
|
|
||||||
# compiler: { type: MSVC, version: 193, cc: "", cxx: "" },
|
|
||||||
# conan-config: "",
|
|
||||||
# }
|
|
||||||
- {
|
- {
|
||||||
name: "GCC-12",
|
name: "GCC-12",
|
||||||
os: ubuntu-24.04,
|
os: ubuntu-24.04,
|
||||||
@@ -259,11 +255,19 @@ jobs:
|
|||||||
- run: echo "std_format=$([ "${{ matrix.formatting }}" == "std::format" ] && echo "True" || echo "False")" >> $GITHUB_ENV
|
- run: echo "std_format=$([ "${{ matrix.formatting }}" == "std::format" ] && echo "True" || echo "False")" >> $GITHUB_ENV
|
||||||
- run: echo "import_std=$([ "${{ matrix.config.cxx_modules }}" == "True" ] && [ "${{ matrix.config.contracts }}" == "none" ] && [ "${{ matrix.formatting }}" == "std::format" ] && echo "True" || echo "False")" >> $GITHUB_ENV
|
- run: echo "import_std=$([ "${{ matrix.config.cxx_modules }}" == "True" ] && [ "${{ matrix.config.contracts }}" == "none" ] && [ "${{ matrix.formatting }}" == "std::format" ] && echo "True" || echo "False")" >> $GITHUB_ENV
|
||||||
- name: Create Conan package
|
- name: Create Conan package
|
||||||
|
if: matrix.config.compiler.type != 'MSVC'
|
||||||
shell: bash
|
shell: bash
|
||||||
run: |
|
run: |
|
||||||
conan create . --user mpusz --channel ${CHANNEL} --lockfile-out=package.lock \
|
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.mp-units.build:all=True \
|
-b mp-units/* -b missing -c tools.cmake.cmaketoolchain:generator="Ninja Multi-Config" -c user.mp-units.build:all=True \
|
||||||
-o '&:cxx_modules=${{ matrix.config.cxx_modules }}' -o '&:import_std=${{ env.import_std }}' -o '&:std_format=${{ env.std_format }}' -o '&:contracts=${{ matrix.contracts }}' ${{ matrix.config.conan-config }}
|
-o '&:cxx_modules=${{ matrix.config.cxx_modules }}' -o '&:import_std=${{ env.import_std }}' -o '&:std_format=${{ env.std_format }}' -o '&:contracts=${{ matrix.contracts }}' ${{ matrix.config.conan-config }}
|
||||||
|
- name: Create Conan package
|
||||||
|
if: matrix.config.compiler.type == 'MSVC'
|
||||||
|
shell: bash
|
||||||
|
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.mp-units.build:all=False \
|
||||||
|
-o '&:cxx_modules=${{ matrix.config.cxx_modules }}' -o '&:import_std=${{ env.import_std }}' -o '&:std_format=${{ env.std_format }}' -o '&:contracts=${{ matrix.contracts }}' ${{ matrix.config.conan-config }}
|
||||||
- name: Obtain package reference
|
- name: Obtain package reference
|
||||||
id: get-package-ref
|
id: get-package-ref
|
||||||
shell: bash
|
shell: bash
|
||||||
|
Reference in New Issue
Block a user