From 406b7ccbc8f3a45ae8ede7c308183f2759ca18c7 Mon Sep 17 00:00:00 2001
From: Will Greenberg <willg@eff.org>
Date: Mon, 22 Aug 2022 15:23:27 -0700
Subject: [PATCH] wip

---
 .../templates/jobs/packaging-jobs.yml         | 24 +++++++++----------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/.azure-pipelines/templates/jobs/packaging-jobs.yml b/.azure-pipelines/templates/jobs/packaging-jobs.yml
index 511401cb8..7f4df5f76 100644
--- a/.azure-pipelines/templates/jobs/packaging-jobs.yml
+++ b/.azure-pipelines/templates/jobs/packaging-jobs.yml
@@ -122,14 +122,13 @@ jobs:
       vmImage: ubuntu-18.04
     strategy:
       matrix:
-        ${{ each snap in parameters.snaps }}
-          ${{ format('{0}-amd64:', snap }}
+          amd64:
             SNAP_ARCH: amd64
           # Do not run the heavy non-amd64 builds for test branches
           ${{ if not(startsWith(variables['Build.SourceBranchName'], 'test-')) }}:
-            ${{ format('{0}-armhf', snap }}:
+            armhf:
               SNAP_ARCH: armhf
-            ${{ format('{0}-arm64', snap }}:
+            arm64:
               SNAP_ARCH: arm64
     timeoutInMinutes: 0
     steps:
@@ -147,14 +146,15 @@ jobs:
         name: credentials
         inputs:
           secureFile: launchpad-credentials
-      - script: |
-          set -e
-          git config --global user.email "$(Build.RequestedForEmail)"
-          git config --global user.name "$(Build.RequestedFor)"
-          mkdir -p ~/.local/share/snapcraft/provider/launchpad
-          cp $(credentials.secureFilePath) ~/.local/share/snapcraft/provider/launchpad/credentials
-          python3 tools/snap/build_remote.py ALL --archs ${SNAP_ARCH} --timeout $(snapBuildTimeout)
-        displayName: Build snaps
+      - ${{ each snap parameters.snaps }}:
+        - script: |
+            set -e
+            git config --global user.email "$(Build.RequestedForEmail)"
+            git config --global user.name "$(Build.RequestedFor)"
+            mkdir -p ~/.local/share/snapcraft/provider/launchpad
+            cp $(credentials.secureFilePath) ~/.local/share/snapcraft/provider/launchpad/credentials
+            python3 tools/snap/build_remote.py $(snap) --archs ${SNAP_ARCH} --timeout $(snapBuildTimeout)
+          displayName: Build snaps
       - script: |
           set -e
           mv *.snap $(Build.ArtifactStagingDirectory)