Unify RISCV variable path

MarioOpenHWGroup · Feb 26, 2024 · 26325ff · 26325ff
1 parent 62f3985
commit 26325ff
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -19,14 +19,15 @@ jobs:
     - name: Prepare
       run: |
           ci/setup.sh
-          tar cfz tools.tar tools/
+          tar cfz tools.tar.gz tools/
+          du -sh tools.tar.gz
 
     - name: Archive production artifacts
       uses: actions/upload-artifact@v3
       with:
         name: compiled-tools
         path: |
-          tools.tar
+          tools.tar.gz
 
   execute-riscv-tests:
     name: execute-riscv-tests
@@ -50,8 +51,8 @@ jobs:
         name: compiled-tools
     - name: Run Tests
       run: |
-          export RISCV=$(pwd)/tools/riscv-toolchain/
           set -x
-          tar xf tools.tar
+          export RISCV=$(pwd)/tools/riscv-toolchain/
+          tar xf tools.tar.gz
           source verif/sim/setup-env.sh
           DV_SIMULATORS=${{matrix.target}} bash ${{matrix.testcase}}
diff --git a/ci/setup.sh b/ci/setup.sh
@@ -3,7 +3,7 @@ set -e
 set -x
 export ROOT=$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)
 export ROOT_PROJECT=$ROOT
-export RISCV=$ROOT_PROJECT/tools/riscv/
+export RISCV=$ROOT_PROJECT/tools/riscv-toolchain/
 
 echo 'deb http://download.opensuse.org/repositories/home:/phiwag:/edatools/xUbuntu_20.04/ /' | sudo tee /etc/apt/sources.list.d/home:phiwag:edatools.list
 curl -fsSL https://download.opensuse.org/repositories/home:phiwag:edatools/xUbuntu_20.04/Release.key | gpg --dearmor | sudo tee /etc/apt/trusted.gpg.d/home_phiwag_edatools.gpg > /dev/null