From ba7007c307b357ebcdef3b28d6fd6fbc6584bbe1 Mon Sep 17 00:00:00 2001
From: Joseph Flinn <joseph.s.flinn@gmail.com>
Date: Wed, 6 Jan 2021 16:58:28 +0000
Subject: [PATCH] getting the correct artifacts uploaded to github

---
 .github/workflows/build-and-sign.yml | 38 +++++++++++++++++++---------
 1 file changed, 26 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/build-and-sign.yml b/.github/workflows/build-and-sign.yml
index a903f273c4..c97c29e344 100644
--- a/.github/workflows/build-and-sign.yml
+++ b/.github/workflows/build-and-sign.yml
@@ -83,19 +83,33 @@ jobs:
       - name: List Dist
         run: dir ./dist
 
-#- name: Upload portable exe artifact
-#  if: github.ref == 'refs/heads/master' || github.event_name == 'release'
-#  uses: actions/upload-artifact@v2
-#  with:
-#    name: Bitwarden-Portable-${{ env.PACKAGE_VERSION }}.exe
-#    path: ./dist/Bitwarden-Portable-${{ env.PACKAGE_VERSION }}.exe
+      - name: Upload signed portable exe artifact
+        #if: github.ref == 'refs/heads/master' || github.event_name == 'release'
+        uses: actions/upload-artifact@v2
+        with:
+          name: Bitwarden-Portable-${{ env.PACKAGE_VERSION }}-signed.exe
+          path: ./dist/Bitwarden-Portable-${{ env.PACKAGE_VERSION }}.exe
 
-#- name: Upload installer exe artifact
-#  if: github.ref == 'refs/heads/master' || github.event_name == 'release'
-#  uses: actions/upload-artifact@v2
-#  with:
-#    name: Bitwarden-Installer-${{ env.PACKAGE_VERSION }}.exe
-#    path: ./dist/nsis-web/Bitwarden-Installer-${{ env.PACKAGE_VERSION }}.exe
+      - name: Upload signed installer exe artifact
+        #if: github.ref == 'refs/heads/master' || github.event_name == 'release'
+        uses: actions/upload-artifact@v2
+        with:
+          name: Bitwarden-Installer-${{ env.PACKAGE_VERSION }}-signed.exe
+          path: ./dist/nsis-web/Bitwarden-Installer-${{ env.PACKAGE_VERSION }}.exe
+
+      - name: Upload signed appx ia32 artifact
+        #if: github.ref == 'refs/heads/master' || github.event_name == 'release'
+        uses: actions/upload-artifact@v2
+        with:
+          name: Bitwarden-${{ env.PACKAGE_VERSION }}-ia32-signed.appx
+          path: ./dist/Bitwarden-${{ env.PACKAGE_VERSION }}-ia32.appx
+
+      - name: Upload signed appx x64 artifact
+        #if: github.ref == 'refs/heads/master' || github.event_name == 'release'
+        uses: actions/upload-artifact@v2
+        with:
+          name: Bitwarden-${{ env.PACKAGE_VERSION }}-x64-signed.appx
+          path: ./dist/Bitwarden-${{ env.PACKAGE_VERSION }}-x64.appx
 
 #- name: Upload release assets
 #  if: github.event_name == 'release'