From 26d1731bd9a061688574938567a8f6923eca2059 Mon Sep 17 00:00:00 2001
From: abejgonzalez <abe.j.gonza@gmail.com>
Date: Thu, 7 Oct 2021 19:42:50 -0700
Subject: [PATCH] Move RISCV env. var. setting interal to scripts

---
 .github/actions/run-tests/action.yml       | 3 ---
 .github/scripts/build-extra-tests.sh       | 8 ++++----
 .github/scripts/run-firesim-scala-tests.sh | 4 ++++
 .github/scripts/run-tests.sh               | 4 ++++
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/.github/actions/run-tests/action.yml b/.github/actions/run-tests/action.yml
index a7cdebcb..33bcad77 100644
--- a/.github/actions/run-tests/action.yml
+++ b/.github/actions/run-tests/action.yml
@@ -15,9 +15,6 @@ runs:
   steps:
     - name: run rtl build script cache of chipyard root should have been loaded by prepare-rtl
       run: |
-        export RISCV="$GITHUB_WORKSPACE/riscv-tools-install"
-        export LD_LIBRARY_PATH="$RISCV/lib"
-        export PATH="$RISCV/bin:$PATH"
         ./.github/scripts/${{ inputs.run-script }} ${{ inputs.project-key }}
       shell: bash
 
diff --git a/.github/scripts/build-extra-tests.sh b/.github/scripts/build-extra-tests.sh
index 68bf7fe6..a77f5482 100755
--- a/.github/scripts/build-extra-tests.sh
+++ b/.github/scripts/build-extra-tests.sh
@@ -3,13 +3,13 @@
 # turn echo on and error on earliest command
 set -ex
 
-export RISCV="$GITHUB_WORKSPACE/riscv-tools-install"
-export LD_LIBRARY_PATH="$RISCV/lib"
-export PATH="$RISCV/bin:$PATH"
-
 # get shared variables
 SCRIPT_DIR="$( cd "$( dirname "$0" )" && pwd )"
 source $SCRIPT_DIR/defaults.sh
 
+export RISCV="$GITHUB_WORKSPACE/riscv-tools-install"
+export LD_LIBRARY_PATH="$RISCV/lib"
+export PATH="$RISCV/bin:$PATH"
+
 make -C $LOCAL_CHIPYARD_DIR/tests clean
 make -C $LOCAL_CHIPYARD_DIR/tests
diff --git a/.github/scripts/run-firesim-scala-tests.sh b/.github/scripts/run-firesim-scala-tests.sh
index a848df62..55a22365 100755
--- a/.github/scripts/run-firesim-scala-tests.sh
+++ b/.github/scripts/run-firesim-scala-tests.sh
@@ -13,6 +13,10 @@ source $SCRIPT_DIR/defaults.sh
 # call clean on exit
 trap clean EXIT
 
+export RISCV="$GITHUB_WORKSPACE/riscv-tools-install"
+export LD_LIBRARY_PATH="$RISCV/lib"
+export PATH="$RISCV/bin:$PATH"
+
 # Directory locations for handling firesim-local installations of libelf/libdwarf
 # This would generally be handled by build-setup.sh/firesim-setup.sh
 firesim_sysroot=lib-install
diff --git a/.github/scripts/run-tests.sh b/.github/scripts/run-tests.sh
index ab3cf5cc..7729579c 100755
--- a/.github/scripts/run-tests.sh
+++ b/.github/scripts/run-tests.sh
@@ -9,6 +9,10 @@ set -ex
 SCRIPT_DIR="$( cd "$( dirname "$0" )" && pwd )"
 source $SCRIPT_DIR/defaults.sh
 
+export RISCV="$GITHUB_WORKSPACE/riscv-tools-install"
+export LD_LIBRARY_PATH="$RISCV/lib"
+export PATH="$RISCV/bin:$PATH"
+
 run_bmark () {
     make run-bmark-tests-fast -j$CI_MAKE_NPROC -C $LOCAL_SIM_DIR $@
 }