ci: patch

saursin · Sep 13, 2023 · ac58587 · ac58587
1 parent 1ca1efd
commit ac58587
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/.github/workflows/atomsim.yml b/.github/workflows/atomsim.yml
@@ -45,7 +45,6 @@ jobs:
         run: |
           echo "${VERILATOR_INSTALL_PATH}/bin" >> $GITHUB_PATH
           echo "RVATOM=$GITHUB_WORKSPACE/riscv-atom" >> $GITHUB_ENV
-          echo "VERILATOR_INCLUDE_PATH:=${VERILATOR_INSTALL_PATH}/share/verilator/include" >> config.mk
 
       - name: Build Atomsim - atombones
         working-directory: riscv-atom

diff --git a/.github/workflows/libcatom.yml b/.github/workflows/libcatom.yml
@@ -54,7 +54,6 @@ jobs:
           echo "${VERILATOR_INSTALL_PATH}/bin" >> $GITHUB_PATH
           echo "${RVTOOLCHAIN_INSTALL_PATH}/bin" >> $GITHUB_PATH
           echo "RVATOM=$GITHUB_WORKSPACE/riscv-atom" >> $GITHUB_ENV
-          echo "VERILATOR_INCLUDE_PATH:=${VERILATOR_INSTALL_PATH}/share/verilator/include" >> config.mk
 
       - name: Build Atomsim - atombones
         working-directory: riscv-atom

diff --git a/.github/workflows/scar.yml b/.github/workflows/scar.yml
@@ -12,6 +12,8 @@ on:
 env:
   VERILATOR_PREBUILT_FILEID: 1rXszcRib7oryDU2sMhZpPxMn5Ev3RbxG
   VERILATOR_INSTALL_PATH: /opt/verilator
+  RVTOOLCHAIN_PREBUILT_FILEID: 1kSxCHqrfe7jrk32N3W_e1YbHj97-EsaN
+  RVTOOLCHAIN_INSTALL_PATH: /opt/riscv
 
 jobs:
   Build:
@@ -40,12 +42,18 @@ jobs:
           sudo mkdir -p ${VERILATOR_INSTALL_PATH}
           sudo tar -xvf verilator_5p006.tar.gz -C ${VERILATOR_INSTALL_PATH}
 
+      - name: Install riscv-gnu-toolchain (64-bit, multilib)
+        run: |
+          gdown ${RVTOOLCHAIN_PREBUILT_FILEID} -O rv64_mutilib.tar.gz
+          sudo mkdir -p ${RVTOOLCHAIN_INSTALL_PATH}
+          sudo tar -xvf rv64_mutilib.tar.gz -C ${RVTOOLCHAIN_INSTALL_PATH}
+
       - name: Setup Environment
         working-directory: riscv-atom
         run: |
           echo "${VERILATOR_INSTALL_PATH}/bin" >> $GITHUB_PATH
+          echo "${RVTOOLCHAIN_INSTALL_PATH}/bin" >> $GITHUB_PATH
           echo "RVATOM=$GITHUB_WORKSPACE/riscv-atom" >> $GITHUB_ENV
-          echo "VERILATOR_INCLUDE_PATH:=${VERILATOR_INSTALL_PATH}/share/verilator/include" >> config.mk
 
       - name: Build Atomsim & Verify - atombones
         working-directory: riscv-atom