removed architecture in CI since it's not working

mrdcvlsc · May 30, 2024 · bf51af7 · bf51af7
1 parent 0405fdc
commit bf51af7
Showing 1 changed file with 12 additions and 10 deletions.
diff --git a/.github/workflows/ctests.yml b/.github/workflows/ctests.yml
@@ -15,23 +15,25 @@ jobs:
       fail-fast: false
       matrix:
         platform:
-        - { name: Windows VS2019, ls: dir, os: windows-2019,  flags: -DCMAKE_BUILD_TYPE=Debug }
-        - { name: Windows VS2022, ls: dir, os: windows-2022,  flags: -DCMAKE_BUILD_TYPE=Debug }
-        - { name: Windows Clang,  ls: dir, os: windows-2022,  flags: -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ }
-        - { name: Windows GCC,    ls: dir, os: windows-2022,  flags: -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ }
-        - { name: Linux Clang,    ls: ls,  os: ubuntu-latest, flags: -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ }
-        - { name: Linux GCC,      ls: ls,  os: ubuntu-latest, flags: -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ }
-        - { name: MacOS XCode,    ls: ls,  os: macos-latest,  flags: -DCMAKE_BUILD_TYPE=Debug }
-        - { name: MacOS Clang,    ls: ls,  os: macos-latest,  flags: -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ }
+        - { name: Windows VS2019, gp: where, ls: dir, os: windows-2019,  flags: -DCMAKE_BUILD_TYPE=Debug }
+        - { name: Windows VS2022, gp: where, ls: dir, os: windows-2022,  flags: -DCMAKE_BUILD_TYPE=Debug }
+        - { name: Windows Clang,  gp: where, ls: dir, os: windows-2022,  flags: -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_COMPILER="C:\Program Files\LLVM\bin\clang" -DCMAKE_CXX_COMPILER="C:\Program Files\LLVM\bin\clang++"" }
+        - { name: Windows GCC,    gp: where, ls: dir, os: windows-2022,  flags: -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ }
+        - { name: Linux Clang,    gp: which, ls: ls,  os: ubuntu-latest, flags: -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ }
+        - { name: Linux GCC,      gp: which, ls: ls,  os: ubuntu-latest, flags: -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=g++ }
+        - { name: MacOS XCode,    gp: which, ls: ls,  os: macos-latest,  flags: -DCMAKE_BUILD_TYPE=Debug }
+        - { name: MacOS Clang,    gp: which, ls: ls,  os: macos-latest,  flags: -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_COMPILER=clang -DCMAKE_CXX_COMPILER=clang++ }
         config:
         - { cxx_version: 20 }
         - { cxx_version: 23 }
-        architecture: [x64, x86]
 
     steps:
     - uses: actions/checkout@v3
 
-    - name: System Info
+    - name: Get Clang and GCC paths
+      run: ${{matrix.platform.gp}} clang && ${{matrix.platform.gp}} gcc
+
+    - name: Config
       run: cmake -S tests -B tests ${{matrix.platform.flags}} -DCMAKE_CXX_STANDARD=${{matrix.config.cxx_version}}
 
     - name: Build