From 4b11897f331ea45f10826cadec9f0c245af53012 Mon Sep 17 00:00:00 2001
From: marton bognar <marton.bognar@kuleuven.be>
Date: Tue, 10 Dec 2024 12:14:08 +0100
Subject: [PATCH] Build fixes

---
 .github/workflows/ci.yml | 13 ++++++++-----
 .gitlab-ci.yml           | 20 ++++++++------------
 tests/Makefile           |  2 +-
 3 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b46f2f8..ddb5e1d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -3,7 +3,7 @@ on: [push, pull_request]
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     steps:
       - name: Check out repository
         uses: actions/checkout@v3
@@ -16,11 +16,14 @@ jobs:
           sudo apt-get -yqq install git lsb-release sudo vim gnupg openjdk-17-jdk verilator gcc-riscv64-unknown-elf curl make gcc g++
       - name: Install sbt
         run: |
-          curl -fL https://github.com/coursier/coursier/releases/latest/download/cs-x86_64-pc-linux.gz | gzip -d > cs && chmod +x cs && ./cs setup --yes
-          export PATH="$PATH:~/.local/share/coursier/bin"
+          sudo apt-get install apt-transport-https gnupg curl -yqq
+          echo "deb https://repo.scala-sbt.org/scalasbt/debian all main" | sudo tee /etc/apt/sources.list.d/sbt.list
+          sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 2EE0EA64E40A89B84B2DF73499E82A75642AC823
+          sudo apt-get update -yqq
+          sudo apt-get install sbt -yqq
       - name: Run Scalafmt
         run: sbt scalafmtCheck
       - name: Static pipeline riscv-tests
-        run: make RISCV_PREFIX=riscv64-unknown-elf ARCHFLAGS="-march=rv32im -mabi=ilp32" -C tests
+        run: make RISCV_PREFIX=riscv64-unknown-elf -C tests
       - name: Dynamic pipeline riscv-tests
-        run: make RISCV_PREFIX=riscv64-unknown-elf CORE=riscv.CoreDynamicExtMem ARCHFLAGS="-march=rv32im -mabi=ilp32" -C tests
+        run: make RISCV_PREFIX=riscv64-unknown-elf CORE=riscv.CoreDynamicExtMem -C tests
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 551103b..6e48a46 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,11 +1,12 @@
-image: ubuntu:jammy
+image: ubuntu:noble
+
+variables:
+  GIT_SUBMODULE_STRATEGY: recursive
 
 before_script:
-  - apt-get update -yqq
-  # Prevent interactive prompt when installing tzdata
-  - DEBIAN_FRONTEND=noninteractive apt-get install tzdata -yqq
+  - apt-get update
   # Install build dependencies
-  - apt-get install build-essential verilator gcc-riscv64-unknown-elf openjdk-11-jdk -yqq
+  - apt-get -yqq install git lsb-release sudo vim gnupg openjdk-17-jdk verilator gcc-riscv64-unknown-elf curl make gcc g++
   # Install dependencies needed for adding the sbt repo
   - apt-get install apt-transport-https gnupg curl -yqq
   # Add keyserver for SBT
@@ -14,11 +15,6 @@ before_script:
   # Install SBT
   - apt-get update -yqq
   - apt-get install sbt -yqq
-  # Log the dependency versions
-  - verilator --version
-  - sbt sbtVersion
-  # Update all submodules (e.g., riscv-tests)
-  - git submodule update --init
 
 scalafmt:
   script:
@@ -27,6 +23,6 @@ scalafmt:
 test:
   script:
     # Execute base RV32IM tests on the static pipeline
-    - make RISCV_PREFIX=riscv64-unknown-elf ARCHFLAGS="-march=rv32im -mabi=ilp32" -C tests
+    - make RISCV_PREFIX=riscv64-unknown-elf -C tests
     # Execute base RV32IM tests on the dynamic pipeline
-    - make RISCV_PREFIX=riscv64-unknown-elf CORE=riscv.CoreDynamicExtMem ARCHFLAGS="-march=rv32im -mabi=ilp32" -C tests
+    - make RISCV_PREFIX=riscv64-unknown-elf CORE=riscv.CoreDynamicExtMem -C tests
diff --git a/tests/Makefile b/tests/Makefile
index c2e41a1..ab59df1 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -12,7 +12,7 @@ RISCV_PREFIX ?= riscv32-unknown-elf
 CC = $(RISCV_PREFIX)-gcc
 LD = $(RISCV_PREFIX)-gcc
 OBJCOPY = $(RISCV_PREFIX)-objcopy
-ARCHFLAGS ?= -march=rv32imzicsr -mabi=ilp32
+ARCHFLAGS ?= -march=rv32im_zicsr -mabi=ilp32
 CFLAGS = $(ARCHFLAGS)
 
 ifeq ($(BUILD_CORE),1)