Squash errors too

pantsbuild · Apr 4, 2024 · c2ed88b · c2ed88b
1 parent 4c1004b
commit c2ed88b
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 16 deletions.
diff --git a/.github/workflows/clear_self_hosted_persistent_caches.yaml b/.github/workflows/clear_self_hosted_persistent_caches.yaml
@@ -13,15 +13,15 @@ jobs:
     - name: df before
       run: df -h
     - name: Deleting ~/Library/Caches
-      run: du -sh ~/Library/Caches || true; rm -rf ~/Library/Caches
+      run: du -sh ~/Library/Caches || true; rm -rf ~/Library/Caches || true
     - name: Deleting ~/.cache
-      run: du -sh ~/.cache || true; rm -rf ~/.cache
+      run: du -sh ~/.cache || true; rm -rf ~/.cache || true
     - name: Deleting ~/.nce
-      run: du -sh ~/.nce || true; rm -rf ~/.nce
+      run: du -sh ~/.nce || true; rm -rf ~/.nce || true
     - name: Deleting ~/.rustup
-      run: du -sh ~/.rustup || true; rm -rf ~/.rustup
+      run: du -sh ~/.rustup || true; rm -rf ~/.rustup || true
     - name: Deleting ~/.pex
-      run: du -sh ~/.pex || true; rm -rf ~/.pex
+      run: du -sh ~/.pex || true; rm -rf ~/.pex || true
     - name: df after
       run: df -h
   clean_macos10_15_x86_64:
@@ -32,15 +32,15 @@ jobs:
     - name: df before
       run: df -h
     - name: Deleting ~/Library/Caches
-      run: du -sh ~/Library/Caches || true; rm -rf ~/Library/Caches
+      run: du -sh ~/Library/Caches || true; rm -rf ~/Library/Caches || true
     - name: Deleting ~/.cache
-      run: du -sh ~/.cache || true; rm -rf ~/.cache
+      run: du -sh ~/.cache || true; rm -rf ~/.cache || true
     - name: Deleting ~/.nce
-      run: du -sh ~/.nce || true; rm -rf ~/.nce
+      run: du -sh ~/.nce || true; rm -rf ~/.nce || true
     - name: Deleting ~/.rustup
-      run: du -sh ~/.rustup || true; rm -rf ~/.rustup
+      run: du -sh ~/.rustup || true; rm -rf ~/.rustup || true
     - name: Deleting ~/.pex
-      run: du -sh ~/.pex || true; rm -rf ~/.pex
+      run: du -sh ~/.pex || true; rm -rf ~/.pex || true
     - name: df after
       run: df -h
   clean_macos11_arm64:
@@ -51,15 +51,15 @@ jobs:
     - name: df before
       run: df -h
     - name: Deleting ~/Library/Caches
-      run: du -sh ~/Library/Caches || true; rm -rf ~/Library/Caches
+      run: du -sh ~/Library/Caches || true; rm -rf ~/Library/Caches || true
     - name: Deleting ~/.cache
-      run: du -sh ~/.cache || true; rm -rf ~/.cache
+      run: du -sh ~/.cache || true; rm -rf ~/.cache || true
     - name: Deleting ~/.nce
-      run: du -sh ~/.nce || true; rm -rf ~/.nce
+      run: du -sh ~/.nce || true; rm -rf ~/.nce || true
     - name: Deleting ~/.rustup
-      run: du -sh ~/.rustup || true; rm -rf ~/.rustup
+      run: du -sh ~/.rustup || true; rm -rf ~/.rustup || true
     - name: Deleting ~/.pex
-      run: du -sh ~/.pex || true; rm -rf ~/.pex
+      run: du -sh ~/.pex || true; rm -rf ~/.pex || true
     - name: df after
       run: df -h
 name: Clear persistent caches on long-lived self-hosted runners

diff --git a/src/python/pants_release/generate_github_workflows.py b/src/python/pants_release/generate_github_workflows.py
@@ -1579,7 +1579,10 @@ def clear_self_hosted_persistent_caches_jobs() -> Jobs:
         clear_steps = [
             {
                 "name": f"Deleting {directory}",
-                "run": f"du -sh {directory} || true; rm -rf {directory}",
+                # squash all errors: this is a best effort thing, so, for instance, it's fine if
+                # there's directories hanging around that this workflow doesn't have permission to
+                # delete
+                "run": f"du -sh {directory} || true; rm -rf {directory} || true",
             }
             for directory in [
                 # not all of these will necessarily exist (e.g. ~/Library/Caches is macOS-specific),