Skip to content

Commit 0d1b644

Browse files
committed
Remove Spack source caches, trim Github default image
1 parent 078b882 commit 0d1b644

File tree

4 files changed

+36
-4
lines changed

4 files changed

+36
-4
lines changed

.github/workflows/artdaq-spack.yaml

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,22 @@ jobs:
5252
echo "ots=${ots}" >> $GITHUB_OUTPUT
5353
5454
- name: Delete huge unnecessary tools folder
55-
run: rm -rf /opt/hostedtoolcache
55+
if: runner.os == 'Linux'
56+
run: |
57+
# Space usage before cleanup
58+
df -h /
59+
60+
# Remove unused tool caches (comment any required ones with #)
61+
sudo rm -rf /usr/lib/jvm
62+
sudo rm -rf /usr/local/.ghcup
63+
sudo rm -rf /usr/local/lib/android
64+
sudo rm -rf /usr/local/share/powershell
65+
sudo rm -rf /usr/share/dotnet
66+
sudo rm -rf /usr/share/swift
67+
sudo rm -rf "$AGENT_TOOLSDIRECTORY"
68+
69+
# Verify gains
70+
df -h /
5671

5772
- name: Check out the daq-docker repo
5873
uses: actions/checkout@main

.github/workflows/otsdaq-spack.yaml

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,22 @@ jobs:
5252
echo "ots=${ots}" >> $GITHUB_OUTPUT
5353
5454
- name: Delete huge unnecessary tools folder
55-
run: rm -rf /opt/hostedtoolcache
55+
if: runner.os == 'Linux'
56+
run: |
57+
# Space usage before cleanup
58+
df -h /
59+
60+
# Remove unused tool caches (comment any required ones with #)
61+
sudo rm -rf /usr/lib/jvm
62+
sudo rm -rf /usr/local/.ghcup
63+
sudo rm -rf /usr/local/lib/android
64+
sudo rm -rf /usr/local/share/powershell
65+
sudo rm -rf /usr/share/dotnet
66+
sudo rm -rf /usr/share/swift
67+
sudo rm -rf "$AGENT_TOOLSDIRECTORY"
68+
69+
# Verify gains
70+
df -h /
5671

5772
- name: Check out the daq-docker repo
5873
uses: actions/checkout@main

dockerfiles/artdaq-spack.dockerfile

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,9 @@ RUN chmod +x /opt/artdaq/quick-spack-start.sh && \
2121
./quick-spack-start.sh --develop --dev-only --no-kmod --arch linux-almalinux9-x86_64_v3 \
2222
--upstream /cvmfs/fermilab.opensciencegrid.org/products/artdaq/spack_areas/$ARTDAQ_AREA \
2323
--upstream /cvmfs/fermilab.opensciencegrid.org/products/artdaq/spack_areas/$ART_AREA
24-
24+
25+
RUN source setup-env.sh && spack clean -a
26+
2527
RUN rm -rf /cvmfs/fermilab.opensciencegrid.org/products
2628

2729
FROM eflumerf/alma9-spack:latest

dockerfiles/otsdaq-spack.dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ RUN chmod +x /opt/otsdaq/ots-quick-spack-start.sh && \
2727
--upstream /cvmfs/fermilab.opensciencegrid.org/products/artdaq/spack_areas/$ARTDAQ_AREA \
2828
--upstream /cvmfs/fermilab.opensciencegrid.org/products/artdaq/spack_areas/$ART_AREA
2929

30-
RUN source setup-env.sh && spack env activate ots-develop
30+
RUN source setup-env.sh && spack env activate ots-develop && spack clean -a
3131

3232
RUN rm -rf /cvmfs/fermilab.opensciencegrid.org/products
3333

0 commit comments

Comments
 (0)