From 993e8e26b8914015c60c6548fa20fffa2f586d2a Mon Sep 17 00:00:00 2001
From: Antonia Elsen <antoniaelsen@gmail.com>
Date: Tue, 4 Jun 2024 00:45:53 -0700
Subject: [PATCH] chore: i don't make the rules

---
 .github/workflows/build.yml          |  6 ++++--
 Makefile                             |  6 +++++-
 scripts/{submod.sh => submodules.sh} | 16 ++++++++--------
 3 files changed, 17 insertions(+), 11 deletions(-)
 rename scripts/{submod.sh => submodules.sh} (83%)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 2fb3119..c6e4ad9 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -16,8 +16,10 @@ jobs:
         builds: [{ rpi: 5 }, { rpi: 4 }, { rpi: 3 }, { rpi: 2 }, { rpi: 1 }]
     steps:
       - uses: actions/checkout@v4
-        with:
-          submodules: recursive
+
+      - name: Setup submodules
+        run: |
+          make submodules
 
       - name: Install toolchain
         run: |
diff --git a/Makefile b/Makefile
index 12d5ef4..639f3d9 100644
--- a/Makefile
+++ b/Makefile
@@ -36,7 +36,11 @@ install:
 .PHONY: install-toolchain
 install-toolchain:
 	@./scripts/install-toolchain.sh
-	
+
+.PHONY: submodules
+submodules:
+	@./scripts/submodules.sh
+
 .PHONY: zip
 zip:
 	@./scripts/zip.sh
diff --git a/scripts/submod.sh b/scripts/submodules.sh
similarity index 83%
rename from scripts/submod.sh
rename to scripts/submodules.sh
index 2d071ea..7e52f2a 100755
--- a/scripts/submod.sh
+++ b/scripts/submodules.sh
@@ -1,24 +1,24 @@
 #!/bin/bash
-set -ex
-#
+
+echo "Updating submodules..."
+
 # Update top-level modules as a baseline
 git submodule update --init --recursive
-#
+
 # Use fixed master branch of circle-stdlib then re-update
 cd external/circle-stdlib/
 git checkout 3bd135d
 git submodule update --init --recursive
 cd -
-#
+
 # Optional update submodules explicitly
 cd external/circle-stdlib/libs/circle
 git checkout 4155f43
 cd -
-cd external/circle-stdlib/libs/circle-newlib
-#git checkout develop
-cd -
-#
+
 # Use fixed master branch of Synth_Dexed
 cd external/Synth_Dexed/
 git checkout c9f5274
 cd -
+
+echo "  Done."