From c35a1121dae272f0977c0d54e14bdd13d9305ee8 Mon Sep 17 00:00:00 2001
From: Hansung Kim <hansung_kim@berkeley.edu>
Date: Sun, 22 Oct 2023 14:59:38 -0700
Subject: [PATCH] [ci] Test CI with different REMOTE_CHIPYARD_DIR than local

---
 .github/actions/prepare-gpu/action.yml | 1 +
 .github/scripts/defaults.sh            | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/actions/prepare-gpu/action.yml b/.github/actions/prepare-gpu/action.yml
index 050e4657..7abca2ba 100644
--- a/.github/actions/prepare-gpu/action.yml
+++ b/.github/actions/prepare-gpu/action.yml
@@ -20,6 +20,7 @@ runs:
     - name: Init submodules to ensure stimuli is located
       run: |
         conda activate ${{ env.conda-env-name-no-time }}-$(date --date "${{ env.workflow-timestamp }}" +%Y%m%d)-${{ inputs.toolchain }}
+        cd $REMOTE_CHIPYARD_DIR
         ./scripts/init-submodules-no-riscv-tools.sh --force
       shell: bash -leo pipefail {0}
 
diff --git a/.github/scripts/defaults.sh b/.github/scripts/defaults.sh
index a5f7f62e..b723cd13 100755
--- a/.github/scripts/defaults.sh
+++ b/.github/scripts/defaults.sh
@@ -9,8 +9,8 @@ REMOTE_MAKE_NPROC=4
 # CI_DIR is defined externally based on the GH repository secret BUILDDIR
 
 REMOTE_PREFIX=$CI_DIR/${GITHUB_REPOSITORY#*/}-${GITHUB_REF_NAME//\//-}
-REMOTE_WORK_DIR=$GITHUB_WORKSPACE
-REMOTE_CHIPYARD_DIR=$GITHUB_WORKSPACE
+REMOTE_WORK_DIR=$REMOTE_PREFIX/$GITHUB_WORKSPACE
+REMOTE_CHIPYARD_DIR=$REMOTE_PREFIX/$GITHUB_WORKSPACE
 REMOTE_SIM_DIR=$REMOTE_CHIPYARD_DIR/sims/verilator
 REMOTE_FIRESIM_DIR=$REMOTE_CHIPYARD_DIR/sims/firesim/sim
 REMOTE_FPGA_DIR=$REMOTE_CHIPYARD_DIR/fpga