From 539f21ee952127b788131549f871d98b3330e5c8 Mon Sep 17 00:00:00 2001
From: Khalil Estell <kammce0@gmail.com>
Date: Mon, 9 Dec 2024 00:44:55 -0700
Subject: [PATCH] Bring back other test matrixes along with Windows

---
 .github/workflows/tests.yml | 47 +++++++++++++++++++++----------------
 1 file changed, 27 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index d44dfd0..00313e0 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -45,15 +45,15 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          # - os: ubuntu-22.04
-          #   installations: sudo apt remove clang-tidy && sudo rm -f /usr/bin/clang-tidy && wget https://apt.llvm.org/llvm.sh && chmod +x llvm.sh && sudo ./llvm.sh 17 && sudo apt install libc++-17-dev libc++abi-17-dev && sudo apt-get install pipx && pipx ensurepath && sudo apt install clang-tidy-17
-          #   enable_coverage: ${{ inputs.coverage }}
-          #   profile_path: profiles/x86_64/linux/
+          - os: ubuntu-22.04
+            installations: sudo apt remove clang-tidy && sudo rm -f /usr/bin/clang-tidy && wget https://apt.llvm.org/llvm.sh && chmod +x llvm.sh && sudo ./llvm.sh 17 && sudo apt install libc++-17-dev libc++abi-17-dev && sudo apt-get install pipx && pipx ensurepath && sudo apt install clang-tidy-17
+            enable_coverage: ${{ inputs.coverage }}
+            profile_path: profiles/x86_64/linux/
 
-          # - os: ubuntu-24.04
-          #   installations: sudo apt remove clang-tidy && sudo rm -f /usr/bin/clang-tidy && wget https://apt.llvm.org/llvm.sh && chmod +x llvm.sh && sudo ./llvm.sh 17 && sudo apt install libc++-17-dev libc++abi-17-dev && sudo apt-get install pipx && pipx ensurepath && sudo apt install clang-tidy-17
-          #   enable_coverage: ${{ inputs.coverage }}
-          #   profile_path: profiles/x86_64/linux/
+          - os: ubuntu-24.04
+            installations: sudo apt remove clang-tidy && sudo rm -f /usr/bin/clang-tidy && wget https://apt.llvm.org/llvm.sh && chmod +x llvm.sh && sudo ./llvm.sh 17 && sudo apt install libc++-17-dev libc++abi-17-dev && sudo apt-get install pipx && pipx ensurepath && sudo apt install clang-tidy-17
+            enable_coverage: ${{ inputs.coverage }}
+            profile_path: profiles/x86_64/linux/
 
           - os: macos-13
             installations: brew install llvm@17 && ls $(brew --prefix llvm@17)/bin && ln -s $(brew --prefix llvm@17)/bin/clang-tidy /usr/local/bin/ && brew install pipx && pipx ensurepath
@@ -67,10 +67,10 @@ jobs:
             installations: brew install llvm@17 && ln -s $(brew --prefix llvm@17)/bin/clang-tidy /usr/local/bin/ && brew install pipx && pipx ensurepath
             profile_path: profiles/x86_64/mac-15/
 
-          # # Skip already installed "git" and "mingw"
-          # - os: windows-2022
-          #   installations: choco install python --version=3.12.2 && choco install mingw && choco install llvm --version=17.0.6
-          #   profile_path: profiles/x86_64/windows/
+          # Skip already installed "git" and "mingw", uses default python 3.9.13
+          - os: windows-2022
+            installations: choco install mingw && choco install llvm --version=17.0.6 --allow-downgrade
+            profile_path: profiles/x86_64/windows/
 
     runs-on: ${{ matrix.os }}
     steps:
@@ -97,17 +97,24 @@ jobs:
       - name: 🔍 conan version
         run: conan --version
 
-      - name: 🔍 cmake version
-        run: cmake --version
+      # - name: 🔍 cmake version
+      #   run: cmake --version
 
-      - name: 🔍 clang++ version
-        run: clang++-17 --version || clang++ --version
+      # - name: 🔍 clang++-17 version
+      #   if: "!cancelled()"
+      #   run: clang++-17 --version
 
-      - name: 🔍 /usr/bin version
-        run: ls /usr/bin/clang*
+      # - name: 🔍 clang++ version
+      #   if: "!cancelled()"
+      #   run: clang++ --version
 
-      - name: 🔍 clang-tidy version
-        run: clang-tidy-17 --version || clang-tidy --version
+      # - name: 🔍 clang-tidy-17 version
+      #   if: "!cancelled()"
+      #   run: clang-tidy-17 --version
+
+      # - name: 🔍 clang-tidy version
+      #   if: "!cancelled()"
+      #   run: clang-tidy --version
 
       - name: 📡 Add `libhal` repo to conan remotes
         run: conan remote add libhal