From 479a59e44be676ac3a3b91e19c2835f35881a5a8 Mon Sep 17 00:00:00 2001
From: Jordan Carlin <jordanmcarlin@gmail.com>
Date: Tue, 16 Jul 2024 00:47:38 -0700
Subject: [PATCH] Run make and regression-wally in installation test

---
 .github/workflows/install.yml | 12 +++++++++++
 .github/workflows/test.yml    | 40 -----------------------------------
 2 files changed, 12 insertions(+), 40 deletions(-)
 delete mode 100644 .github/workflows/test.yml

diff --git a/.github/workflows/install.yml b/.github/workflows/install.yml
index 51940249a..4c2e36afd 100644
--- a/.github/workflows/install.yml
+++ b/.github/workflows/install.yml
@@ -37,6 +37,12 @@ jobs:
       - uses: actions/checkout@v4
       - name: install
         run: sudo ./bin/wally-tool-chain-install.sh
+      - name: setup
+        run: source setup.sh
+      - name: make tests
+        run: make
+      - name: regresssion
+        run: regression-wally
   rhel_family_install:
     name: Test installation on ${{ matrix.os }}
     runs-on: ubuntu-latest
@@ -62,3 +68,9 @@ jobs:
       - uses: actions/checkout@v4
       - name: install
         run: ./bin/wally-tool-chain-install.sh
+      - name: setup
+        run: source setup.sh
+      - name: make tests
+        run: make
+      - name: regresssion
+        run: regression-wally
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
deleted file mode 100644
index 0c95356f3..000000000
--- a/.github/workflows/test.yml
+++ /dev/null
@@ -1,40 +0,0 @@
-name: test
-
-on: [workflow_dispatch]
-
-jobs:
-  ubuntu_install:
-    name: Test installation on ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        os: ["ubuntu-20.04", "ubuntu-22.04"]
-    steps:
-      - uses: actions/checkout@v4
-      - name: check
-        run: |
-              pwd
-              ls
-              mkdir /opt/riscv
-              source setup.sh
-              echo $PATH
-  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:
-      fail-fast: false
-      matrix:
-        os: ["rockylinux:8", "almalinux:8"]
-    steps:
-      - uses: actions/checkout@v4
-      - name: check
-        run: |
-              pwd
-              ls
-              mkdir /opt/riscv
-              source setup.sh
-              echo $PATH