ci: fix test CI scripts

openhwgroup · Oct 27, 2024 · 8874eb7 · 8874eb7
1 parent 44af8cc
commit 8874eb7
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 5 deletions.
diff --git a/.github/scripts/install_systemc.sh b/.github/scripts/install_systemc.sh
@@ -58,8 +58,13 @@ if [[ ${systemc_installed} == "no" ]] ; then
     mkdir -p ${SYSTEMC_HOME}/objdir ;
     cd ${SYSTEMC_HOME}/objdir ;
     ../configure ;
+    [[ $? != 0 ]] && exit 1 ;
+
     make -j${num_jobs} ;
+    [[ $? != 0 ]] && exit 1 ;
+
     make install ;
+    [[ $? != 0 ]] && exit 1 ;
 
     #  housekeeping
     rm -rf ${SYSTEMC_HOME}/objdir ;
@@ -101,8 +106,13 @@ if [[ ${scv_installed} == "no" ]] ; then
     mkdir -p ${SCV_HOME}/objdir ;
     cd ${SCV_HOME}/objdir ;
     ../configure --with-systemc=${SYSTEMC_HOME} ;
+    [[ $? != 0 ]] && exit 1 ;
+
     make -j${num_jobs} ;
+    [[ $? != 0 ]] && exit 1 ;
+
     make install ;
+    [[ $? != 0 ]] && exit 1 ;
 
     #  housekeeping
     rm -rf ${SCV_HOME}/objdir ;

diff --git a/.github/scripts/install_verilator.sh b/.github/scripts/install_verilator.sh
@@ -54,7 +54,10 @@ if [[ ${verilator_installed} == "no" ]]; then
     cd ${VERILATOR_ROOT} ;
     autoconf ;
     ./configure ;
+    [[ $? != 0 ]] && exit 1 ;
+
     make -j${num_jobs} ;
+    [[ $? != 0 ]] && exit 1 ;
 
     #  housekeeping
     rm -rf ${VERILATOR_ROOT}/src/obj_dbg ;

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -31,25 +31,32 @@ jobs:
     steps:
       - uses: actions/checkout@master
 
+      #  Install Dependencies
+      - name: Install Dependencies
+        run: |
+          ./.github/scripts/install_deps_ubuntu.sh
+
+      #  Install SystemC
       - name: Cache SystemC
         id: cache-systemc
         uses: actions/cache@v3
         with:
           path: build/systemc-3.0.1
           key: ${{ runner.os }}-build-${{ hashFiles('.github/scripts/install_systemc.sh') }}
 
+      - name: Install SystemC
+        run: |
+          . .github/scripts/env.sh
+          ./.github/scripts/install_systemc.sh
+
+      #  Install Verilator
       - name: Cache Verilator
         id: cache-verilator
         uses: actions/cache@v3
         with:
           path: build/verilator-v5.028
           key: ${{ runner.os }}-build-${{ hashFiles('.github/scripts/install_verilator.sh') }}
 
-      - name: Install SystemC
-        run: |
-          . .github/scripts/env.sh
-          ./.github/scripts/install_systemc.sh
-
       - name: Install Verilator
         run: |
           . .github/scripts/env.sh