From 5811099446104fab2ce0668270fe0a05e98d3857 Mon Sep 17 00:00:00 2001
From: Jordan Carlin <jordanmcarlin@gmail.com>
Date: Tue, 16 Jul 2024 00:14:57 -0700
Subject: [PATCH] Test all supported distros

---
 .github/workflows/install.yml      | 37 +++++++++++++++++++++++++-----
 .github/workflows/rockyInstall.yml | 27 ----------------------
 2 files changed, 31 insertions(+), 33 deletions(-)
 delete mode 100644 .github/workflows/rockyInstall.yml

diff --git a/.github/workflows/install.yml b/.github/workflows/install.yml
index b3cc2b6f4..ac25d884b 100644
--- a/.github/workflows/install.yml
+++ b/.github/workflows/install.yml
@@ -1,12 +1,14 @@
-name: Installation test
+name: Installation
 
 on: [workflow_dispatch]
 
 jobs:
-  install:
-    name: Test installation on Ubuntu 22.04LTS
-    runs-on: ubuntu-22.04
-
+  ubuntu_install:
+    name: Test installation on ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os: [ubuntu-20.04, ubuntu-22.04, ubuntu-24.04]
     steps:
       - name: Free up storage
         run: |
@@ -34,4 +36,27 @@ jobs:
       - uses: actions/checkout@v4
       - name: install
         run: sudo ./bin/wally-tool-chain-install.sh
-    
+  rhel_family_install:
+    name: Test installation on ${{ matrix.os }}
+    runs-on: ubuntu-latest
+    container:
+      image: ${{ matrix.os }}
+      options: --privileged --mount type=bind,source=/,target=/host
+    strategy:
+      matrix:
+        os: [rockylinux:8, rockylinux:9, almalinux:8, almalinux:9]
+    steps:
+      - name: check distro
+        run: cat /etc/os-release
+      - run: dnf install -y sudo
+      - name: free up storage
+        run: |
+              df -h
+              sudo rm -rf /host/usr/local/lib/android
+              sudo rm -rf /host/usr/share/dotnet &> /dev/null
+              sudo rm -rf /host/opt/ghc &> /dev/null
+              sudo rm -rf /host/opt/hostedtoolcache/CodeQL &> /dev/null
+              df -h
+      - uses: actions/checkout@v4
+      - name: install
+        run: ./bin/wally-tool-chain-install.sh
diff --git a/.github/workflows/rockyInstall.yml b/.github/workflows/rockyInstall.yml
deleted file mode 100644
index 627ab6bcc..000000000
--- a/.github/workflows/rockyInstall.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-name: Rocky installation test
-
-on: [workflow_dispatch]
-
-jobs:
-  install:
-    name: Test installation on Rocky 8
-    runs-on: ubuntu-latest
-    container:
-      image: rockylinux:8
-      options: --privileged --mount type=bind,source=/,target=/host
-    steps:
-      - name: check distro
-        run: cat /etc/os-release
-      - run: dnf install -y sudo
-      - name: free up storage
-        run: |
-              df -h
-              sudo rm -rf /host/usr/local/lib/android
-              sudo rm -rf /host/usr/share/dotnet &> /dev/null
-              sudo rm -rf /host/opt/ghc &> /dev/null
-              sudo rm -rf /host/opt/hostedtoolcache/CodeQL &> /dev/null
-              df -h
-      - uses: actions/checkout@v4
-      - name: install
-        run: ./bin/wally-tool-chain-install.sh
-