From 551c096bc931e053ade212bd8cf029922b92d86f Mon Sep 17 00:00:00 2001
From: abejgonzalez <abe.j.gonza@gmail.com>
Date: Thu, 7 Dec 2023 11:00:59 -0800
Subject: [PATCH] Fix CIRCT installer path | Run CRON every 15m

---
 .github/actions/create-conda-env/action.yml | 6 +++---
 .github/workflows/update-circt.yml          | 3 ++-
 .gitmodules                                 | 2 +-
 scripts/build-setup.sh                      | 5 +++--
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/.github/actions/create-conda-env/action.yml b/.github/actions/create-conda-env/action.yml
index cc9031e9..e29a06e9 100644
--- a/.github/actions/create-conda-env/action.yml
+++ b/.github/actions/create-conda-env/action.yml
@@ -15,10 +15,10 @@ runs:
           conda deactivate
 
           echo "Add extra toolchain collateral + CIRCT to RISC-V install area"
-          git submodule update --init ./conda-reqs/install-circt
+          git submodule update --init ./tools/install-circt
           conda activate ${{ env.conda-env-name-no-time }}-$(date --date "${{ env.workflow-timestamp }}" +%Y%m%d)-riscv-tools
           ./scripts/build-toolchain-extra.sh riscv-tools -p $CONDA_PREFIX/riscv-tools
-          ./conda-reqs/install-circt/bin/download-release-or-nightly-circt.sh \
+          ./tools/install-circt/bin/download-release-or-nightly-circt.sh \
               -f circt-full-shared-linux-x64.tar.gz \
               -i $CONDA_PREFIX \
               -v version-file \
@@ -27,7 +27,7 @@ runs:
           conda deactivate
           conda activate ${{ env.conda-env-name-no-time }}-$(date --date "${{ env.workflow-timestamp }}" +%Y%m%d)-esp-tools
           ./scripts/build-toolchain-extra.sh esp-tools -p $CONDA_PREFIX/esp-tools
-          ./conda-reqs/install-circt/bin/download-release-or-nightly-circt.sh \
+          ./tools/install-circt/bin/download-release-or-nightly-circt.sh \
               -f circt-full-shared-linux-x64.tar.gz \
               -i $CONDA_PREFIX \
               -v version-file \
diff --git a/.github/workflows/update-circt.yml b/.github/workflows/update-circt.yml
index 173f1901..2d52a155 100644
--- a/.github/workflows/update-circt.yml
+++ b/.github/workflows/update-circt.yml
@@ -3,7 +3,8 @@ name: update-circt
 # run daily
 on:
   schedule:
-    - cron: 0 8 * * *
+    - cron: 0,15,30,45 * * * *
+    #- cron: 0 8 * * *
 
 defaults:
   run:
diff --git a/.gitmodules b/.gitmodules
index 561102fc..db0837ec 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -139,6 +139,6 @@
 [submodule "generators/rocc-acc-utils"]
 	path = generators/rocc-acc-utils
 	url = https://github.com/ucb-bar/rocc-acc-utils
-[submodule "conda-reqs/install-circt"]
+[submodule "tools/install-circt"]
 	path = tools/install-circt
 	url = https://github.com/circt/install-circt/
diff --git a/scripts/build-setup.sh b/scripts/build-setup.sh
index 763e98b1..9d79735a 100755
--- a/scripts/build-setup.sh
+++ b/scripts/build-setup.sh
@@ -153,8 +153,8 @@ if run_step "1"; then
     exit_if_last_command_failed
 
     # install circt into conda
-    git submodule update --init $CYDIR/conda-reqs/install-circt &&
-    $CYDIR/conda-reqs/install-circt/bin/download-release-or-nightly-circt.sh \
+    git submodule update --init $CYDIR/tools/install-circt &&
+    $CYDIR/tools/install-circt/bin/download-release-or-nightly-circt.sh \
         -f circt-full-shared-linux-x64.tar.gz \
         -i $CONDA_PREFIX \
         -v version-file \
@@ -181,6 +181,7 @@ END_CONDA_ACTIVATE
 $CONDA_ACTIVATE_PREAMBLE
 conda activate $CYDIR/.conda-env
 source $CYDIR/scripts/fix-open-files.sh"
+
 fi
 
 if [ -z "$FORCE_FLAG" ]; then