Trying larger combinatory

SofaDefrost · Jan 21, 2025 · 9426528 · 9426528
1 parent fddd897
commit 9426528
Showing 1 changed file with 30 additions and 8 deletions.
diff --git a/.github/workflows/ci-conda.yml b/.github/workflows/ci-conda.yml
@@ -16,6 +16,7 @@ jobs:
         python_version: ["3.13"]
         build_type: ["Release"]
         qp_solver: ["qpOases", "proxQP"]
+        cxx_std: ["17", "20"]
 
     steps:
     - name: Install miniconda [Linux & macOS & Windows]
@@ -49,11 +50,17 @@ jobs:
       run: |
         conda install cmake compilers make ninja
 
-    - name: Install compilation environment [Conda / Windows]
+    - name: Install compilation environment [Conda / Windows CL]
       if: contains(matrix.os, 'windows')
       shell: bash -l {0}
       run: |
-        conda install cmake compilers make ninja clang
+        conda install cmake compilers vs2022_win-64
+
+    # - name: Install compilation environment [Conda / Windows clang]
+    #   if: contains(matrix.os, 'windows')
+    #   shell: bash -l {0}
+    #   run: |
+    #     conda install cmake compilers make ninja clang
 
     - name: Install dependencies [Conda]
       shell: bash -l {0}
@@ -95,25 +102,40 @@ jobs:
         mkdir build
         cd build
         cmake .. -GNinja $CMAKE_OPTS_QPSOLVER \
+         -DCMAKE_CXX_STANDARD=${{ matrix.cxx_std }} \
          -DCMAKE_INSTALL_PREFIX=${CONDA_PREFIX} \
          -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} \
          -DPython_EXECUTABLE:PATH=${CONDA_PREFIX}/bin/python \
          -DSOFTROBOTSINVERSE_BUILD_TESTS:BOOL=ON
 
-    - name: Configure [Conda / Windows]
+    # - name: Configure [Conda / Windows-clang]
+    #   if: contains(matrix.os, 'windows')
+    #   shell: bash -l {0}
+    #   run: |
+    #     mkdir build
+    #     cd build
+    #     export CXX=clang-cl
+    #     export CC=clang-cl
+    #     cmake .. -GNinja $CMAKE_OPTS_QPSOLVER  \
+    #      -DCMAKE_CXX_STANDARD=${{ matrix.cxx_std }} \
+    #      -DCMAKE_INSTALL_PREFIX=${CONDA_PREFIX} \
+    #      -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} \
+    #      -DPython_EXECUTABLE:PATH=${CONDA_PREFIX}/python.exe \
+    #      -DSOFTROBOTSINVERSE_BUILD_TESTS:BOOL=ON
+
+    - name: Configure [Conda / Windows CL]
       if: contains(matrix.os, 'windows')
       shell: bash -l {0}
       run: |
         mkdir build
         cd build
-        export CXX=clang-cl
-        export CC=clang-cl
-        cmake .. -GNinja $CMAKE_OPTS_QPSOLVER  \
-         -DCMAKE_CXX_STANDARD=20 \
+        cmake .. G"Visual Studio 17 2022" -T "v143" $CMAKE_OPTS_QPSOLVER  \
+         -DCMAKE_GENERATOR_PLATFORM=x64 \
+         -DCMAKE_CXX_STANDARD=${{ matrix.cxx_std }} \
          -DCMAKE_INSTALL_PREFIX=${CONDA_PREFIX} \
          -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} \
          -DPython_EXECUTABLE:PATH=${CONDA_PREFIX}/python.exe \
-         -DSOFTROBOTSINVERSE_BUILD_TESTS:BOOL=ON
+         -DSOFTROBOTSINVERSE_BUILD_TESTS:BOOL=ON         
 
     - name: Build [Conda]
       shell: bash -l {0}