Trying to debug windows ci 11

Bench: 2134743
SzilBalazs · Aug 17, 2023 · c01a86d · c01a86d
1 parent 241a36c
commit c01a86d
Showing 1 changed file with 11 additions and 4 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -12,29 +12,36 @@ jobs:
       matrix:
         os: [ubuntu-latest, windows-latest]
         arch: [popcnt, avx2, bmi2]
+        compiler: [g++, clang++]
         include:
           - os: ubuntu-latest
             suffix: "-linux"
-            compiler: [g++, clang++]
             packages: |
               sudo apt-get update
               sudo apt-get install -y valgrind clang-15 g++-multilib
           - os: windows-latest
-            compiler: [g++, clang-cl]
             suffix: "-win"
             exe-suffix: ".exe"
 
     steps:
       - uses: actions/checkout@v3
 
+      - name: Set compiler
+        run: |
+          if [[ "${{ runner.os }}" == "Windows" && "${{ matrix.compiler }}" == 'clang++' ]]; then
+            echo 'COMPILER=clang-cl' >> $GITHUB_ENV
+          else
+            echo "COMPILER=${{ matrix.compiler }}" >> $GITHUB_ENV
+          fi
+
       - name: Install required packages
         if: matrix.os == 'ubuntu-latest'
         run: ${{ matrix.packages }}
 
       - name: Build WhiteCore
         run: |
-          ${{matrix.compiler}} --version
-          make EXE=WhiteCore-${{matrix.arch}}${{matrix.suffix}} ARCH=${{matrix.arch}} CXX=${{matrix.compiler}} build=debug
+          $COMPILER --version
+          make EXE=WhiteCore-${{matrix.arch}}${{matrix.suffix}} ARCH=${{matrix.arch}} CXX=$COMPILER build=debug
 
       - name: Run tests
         run: ./WhiteCore-${{matrix.arch}}${{matrix.suffix}} test