From 52fac9f6435f4fa6f3568edbb738a68c0b61b7da Mon Sep 17 00:00:00 2001
From: abejgonzalez <abe.j.gonza@gmail.com>
Date: Tue, 15 Feb 2022 09:34:54 -0800
Subject: [PATCH 1/3] Bump FireSim

---
 sims/firesim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sims/firesim b/sims/firesim
index 9636f8f8..d45f40e7 160000
--- a/sims/firesim
+++ b/sims/firesim
@@ -1 +1 @@
-Subproject commit 9636f8f874671f8d1a3b8509d95febc34222a66f
+Subproject commit d45f40e77c785ce4658e88d136ef643c0424b90f

From 47485966d07eef635f4a197678f051ce3331e9e1 Mon Sep 17 00:00:00 2001
From: abejgonzalez <abe.j.gonza@gmail.com>
Date: Tue, 15 Feb 2022 09:41:29 -0800
Subject: [PATCH 2/3] Fix branch name in CI

---
 .github/scripts/defaults.sh | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/scripts/defaults.sh b/.github/scripts/defaults.sh
index 25bffb6a..8022a470 100755
--- a/.github/scripts/defaults.sh
+++ b/.github/scripts/defaults.sh
@@ -9,12 +9,11 @@ REMOTE_MAKE_NPROC=4
 VERILATOR_VERSION=v4.034
 
 HOME=$GITHUB_WORKSPACE
-CURRENT_BRANCH=$(git branch --show-current)
 
 # remote variables
 # CI_DIR is defined externally based on the GH repository secret BUILDDIR
 
-REMOTE_PREFIX=$CI_DIR/${GITHUB_REPOSITORY#*/}-$CURRENT_BRANCH
+REMOTE_PREFIX=$CI_DIR/${GITHUB_REPOSITORY#*/}-${GITHUB_REF_NAME//\//-}
 REMOTE_WORK_DIR=$GITHUB_WORKSPACE
 REMOTE_RISCV_DIR=$GITHUB_WORKSPACE/riscv-tools-install
 REMOTE_ESP_DIR=$GITHUB_WORKSPACE/esp-tools-install

From b5e17abf9af764790bb0319bd97e8e20063603d7 Mon Sep 17 00:00:00 2001
From: abejgonzalez <abe.j.gonza@gmail.com>
Date: Tue, 15 Feb 2022 22:26:43 -0800
Subject: [PATCH 3/3] Bump FireSim

---
 sims/firesim | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sims/firesim b/sims/firesim
index d45f40e7..eab25ae1 160000
--- a/sims/firesim
+++ b/sims/firesim
@@ -1 +1 @@
-Subproject commit d45f40e77c785ce4658e88d136ef643c0424b90f
+Subproject commit eab25ae18fb669a8d70b9b170160645e1e13c75f