From 068b7e32bbb6951497019d920120cf593559607a Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Thu, 13 Feb 2025 11:11:36 +0000
Subject: [PATCH] Iterate

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .github/workflows/build_linux.yaml   | 15 +++++++--------
 .github/workflows/build_macos.yaml   | 13 +++++--------
 .github/workflows/build_windows.yaml | 18 +++++++++---------
 3 files changed, 21 insertions(+), 25 deletions(-)

diff --git a/.github/workflows/build_linux.yaml b/.github/workflows/build_linux.yaml
index e5e9235b..62f1f137 100644
--- a/.github/workflows/build_linux.yaml
+++ b/.github/workflows/build_linux.yaml
@@ -173,14 +173,6 @@ jobs:
               env:
                   ARCH: ${{ steps.config.outputs.arch }}
 
-            - name: Assert all required files are present
-              run: |
-                  set -x
-                  test -f ./dist/element-desktop*$ARCH.deb
-                  test -f ./dist/element-desktop*.tar.gz
-              env:
-                  ARCH: ${{ inputs.arch }}
-
             # We exclude *-unpacked as it loses permissions and the tarball contains it with correct permissions
             - name: Upload Artifacts
               uses: actions/upload-artifact@v4
@@ -190,3 +182,10 @@ jobs:
                       dist
                       !dist/*-unpacked/**
                   retention-days: 1
+
+            - name: Assert all required files are present
+              run: |
+                  test -f ./dist/element-desktop*$ARCH.deb
+                  test -f ./dist/element-desktop*.tar.gz
+              env:
+                  ARCH: ${{ inputs.arch }}
diff --git a/.github/workflows/build_macos.yaml b/.github/workflows/build_macos.yaml
index 970c53e5..5035aae0 100644
--- a/.github/workflows/build_macos.yaml
+++ b/.github/workflows/build_macos.yaml
@@ -134,14 +134,6 @@ jobs:
               env:
                   VERSION: ${{ inputs.version }}
 
-            - name: Assert all required files are present
-              run: |
-                  set -x
-                  test -f ./dist/Element*.dmg
-                  test -f ./dist/Element*-mac.zip
-                  test -f ./dist/releases.json
-                  test -f ./dist/releases-legacy.json
-
             # We exclude mac-universal as the unpacked app takes forever to upload and zip and dmg already contains it
             - name: Upload Artifacts
               uses: actions/upload-artifact@v4
@@ -151,3 +143,8 @@ jobs:
                       dist
                       !dist/mac-universal/**
                   retention-days: 1
+
+            - name: Assert all required files are present
+              run: |
+                  test -f ./dist/Element*.dmg
+                  test -f ./dist/Element*-mac.zip
diff --git a/.github/workflows/build_windows.yaml b/.github/workflows/build_windows.yaml
index cdabe55e..1568f50d 100644
--- a/.github/workflows/build_windows.yaml
+++ b/.github/workflows/build_windows.yaml
@@ -175,19 +175,11 @@ jobs:
               run: |
                   yarn electron-builder --publish never -w ${{ steps.config.outputs.build-args }}
 
-            - name: Assert all required files are present
-              run: |
-                  Test-Path './dist/win-*unpacked/Element*.exe'
-                  Test-Path './dist/squirrel-windows*/Element Setup*.exe'
-                  Test-Path './dist/squirrel-windows*/element-desktop-*-full.nupkg'
-                  Test-Path './dist/squirrel-windows*/RELEASES'
-                  Test-Path './dist/Element*.msi'
-
             - name: Trust eSigner demo cert
               if: inputs.sign == ''
               run: |
                   Invoke-WebRequest -OutFile SSLcom-DEV.crt "$env:SSLCOM_DEV_CRT"
-                  Import-Certificate -CertStoreLocation Cert:\CurrentUser\Root -FilePath .\SSLcom-DEV.crt
+                  Import-Certificate -CertStoreLocation Cert:\CurrentUser\My -FilePath ./SSLcom-DEV.crt
               env:
                   INSTALL_DIR: C:\Users\runneradmin\eSignerCKA
                   MASTER_KEY_FILE: C:\Users\runneradmin\eSignerCKA\master.key
@@ -205,3 +197,11 @@ jobs:
                   path: |
                       dist
                   retention-days: 1
+
+            - name: Assert all required files are present
+              run: |
+                  Test-Path './dist/win-*unpacked/Element*.exe'
+                  Test-Path './dist/squirrel-windows*/Element Setup*.exe'
+                  Test-Path './dist/squirrel-windows*/element-desktop-*-full.nupkg'
+                  Test-Path './dist/squirrel-windows*/RELEASES'
+                  Test-Path './dist/Element*.msi'