From 61ca1f2cd2a0ff1bd2cdbb7b5dc7a280f26b8f54 Mon Sep 17 00:00:00 2001
From: Erica Portnoy <erica@eff.org>
Date: Wed, 29 Apr 2026 14:56:49 -0700
Subject: [PATCH] flatten armhf snaps layout for testing and uploading

---
 .github/workflows/snap_packaging_jobs.yml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/snap_packaging_jobs.yml b/.github/workflows/snap_packaging_jobs.yml
index f0746ce8d..72b83a8c2 100644
--- a/.github/workflows/snap_packaging_jobs.yml
+++ b/.github/workflows/snap_packaging_jobs.yml
@@ -103,13 +103,15 @@ jobs:
         mkdir -p ~/.local/share/snapcraft/
         echo "$LAUNCHPAD_CREDS" > ~/.local/share/snapcraft/launchpad-credentials
         python3 tools/snap/build_remote.py ALL --archs "$SNAP_ARCH" --timeout ${{ env.snapBuildTimeout }}
+    - name: Flatten snaps layout
+      run: |-
+        mv *.snap ${{ runner.temp }}
+        mv certbot-dns-*/*.snap ${{ runner.temp }
     - name: Store snaps artifacts
       uses: actions/upload-artifact@v7.0.0
       with:
         name: snaps_${{ env.SNAP_ARCH }}
-        path: |
-          *.snap
-          certbot-dns-*/*.snap
+        path: "${{ runner.temp }}"
   snap_run:
     name: Test certbot ${{ matrix.arch-name }}
     needs: