From 58665ea172fd0d22e136eeeee8b7eabea70704f4 Mon Sep 17 00:00:00 2001
From: Ella Schwarz <schwarzem@a6.Millennium.Berkeley.EDU>
Date: Thu, 21 Jan 2021 20:46:01 -0800
Subject: [PATCH] Added hardcoded environment variables to CI-Dockerfile and
 updated config.yml with new docker image

---
 .circleci/config.yml      | 2 +-
 Dockerfiles/CI-Dockerfile | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 5bbaee63..35137940 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -12,7 +12,7 @@ parameters:
 executors:
     main-env:
         docker:
-            - image: schwarzem/chipyard-test:1.0.0
+            - image: schwarzem/chipyard-test:1.0.1
         environment:
             JVM_OPTS: -Xmx3200m # Customize the JVM maximum heap limit
 
diff --git a/Dockerfiles/CI-Dockerfile b/Dockerfiles/CI-Dockerfile
index 96df4ade..11d064d2 100644
--- a/Dockerfiles/CI-Dockerfile
+++ b/Dockerfiles/CI-Dockerfile
@@ -27,6 +27,11 @@ RUN groupadd --gid 3434 riscvuser \
 WORKDIR /home/riscvuser
 USER riscvuser
 
+# Update PATH for RISCV toolchain (note: hardcoded for CircleCI)
+ENV RISCV="/home/riscvuser/riscv-tools-install"
+ENV LD_LIBRARY_PATH="$RISCV/lib"
+ENV PATH="$RISCV/bin:$PATH"
+
 # Install Chipyard
 RUN git clone https://github.com/ucb-bar/chipyard.git && \
         cd chipyard && \