remove a whole bunch of stuff in the build environments on GitHub bef…

…ore building the ISO to free up space
mmguero-dev · Jun 21, 2024 · 4066611 · 4066611
1 parent 76a5b4b
commit 4066611
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/.github/workflows/hedgehog-iso-build-docker-wrap-push-ghcr.yml b/.github/workflows/hedgehog-iso-build-docker-wrap-push-ghcr.yml
@@ -46,8 +46,14 @@ jobs:
         run: |
           sudo docker rmi $(docker image ls -aq) >/dev/null 2>&1 || true
           sudo rm -rf \
-            /usr/share/dotnet /usr/local/lib/android /opt/ghc /usr/lib/jvm \
-            /usr/local/share/powershell /usr/share/swift /usr/local/.ghcup || true
+            "$AGENT_TOOLSDIRECTORY" \
+            /opt/ghc \
+            /usr/lib/jvm \
+            /usr/local/.ghcup \
+            /usr/local/lib/android \
+            /usr/local/share/powershell \
+            /usr/share/dotnet \
+            /usr/share/swift >/dev/null 2>&1 || true
           sudo env DEBIAN_FRONTEND=noninteractive apt-get -q -y update >/dev/null 2>&1
           sudo env DEBIAN_FRONTEND=noninteractive apt-get -q -y --purge remove \
             azure-cli \

diff --git a/.github/workflows/malcolm-iso-build-docker-wrap-push-ghcr.yml b/.github/workflows/malcolm-iso-build-docker-wrap-push-ghcr.yml
@@ -52,8 +52,14 @@ jobs:
         run: |
           sudo docker rmi $(docker image ls -aq) >/dev/null 2>&1 || true
           sudo rm -rf \
-            /usr/share/dotnet /usr/local/lib/android /opt/ghc /usr/lib/jvm \
-            /usr/local/share/powershell /usr/share/swift /usr/local/.ghcup || true
+            "$AGENT_TOOLSDIRECTORY" \
+            /opt/ghc \
+            /usr/lib/jvm \
+            /usr/local/.ghcup \
+            /usr/local/lib/android \
+            /usr/local/share/powershell \
+            /usr/share/dotnet \
+            /usr/share/swift >/dev/null 2>&1 || true
           sudo env DEBIAN_FRONTEND=noninteractive apt-get -q -y update >/dev/null 2>&1
           sudo env DEBIAN_FRONTEND=noninteractive apt-get -q -y --purge remove \
             azure-cli \