From 92d4afb28dc2637ed528312f81e34652722e6371 Mon Sep 17 00:00:00 2001
From: Joseph Flinn <joseph.s.flinn@gmail.com>
Date: Wed, 6 Jan 2021 20:38:30 +0000
Subject: [PATCH] removing appveyor to stop the fork from sending the repo to
 be built. Testing a release

---
 .github/workflows/build-and-sign.yml          | 27 ++++++------
 .github/workflows/build.yml                   | 44 +++++++++----------
 ...eyor.yml => appveyor.yml.flagged-to-remove |  0
 3 files changed, 34 insertions(+), 37 deletions(-)
 rename appveyor.yml => appveyor.yml.flagged-to-remove (100%)

diff --git a/.github/workflows/build-and-sign.yml b/.github/workflows/build-and-sign.yml
index dae775b2..53c2f3bc 100644
--- a/.github/workflows/build-and-sign.yml
+++ b/.github/workflows/build-and-sign.yml
@@ -110,16 +110,17 @@ jobs:
           name: Bitwarden-${{ env.PACKAGE_VERSION }}-x64.appx
           path: ./dist/Bitwarden-${{ env.PACKAGE_VERSION }}-x64.appx
 
-#- name: Upload release assets
-#  if: github.event_name == 'release'
-#  run: |
-#    hub release edit `
-#      -a ./dist/chocolatey/bitwarden.${{ env.PACKAGE_VERSION }}.nupkg `
-#      -a ./dist/Bitwarden-${{ env.PACKAGE_VERSION }}-ia32-store.appx `
-#      -a ./dist/Bitwarden-${{ env.PACKAGE_VERSION }}-x64-store.appx `
-#      -m "$($env:RELEASE_TAG_NAME.TrimStart('v'))" `
-#      $env:RELEASE_TAG_NAME
-#  shell: pwsh
-#  env:
-#    GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-#    RELEASE_TAG_NAME: ${{ github.event.release.tag_name }}
+      - name: Upload release assets
+        if: github.event_name == 'release'
+        run: |
+          hub release edit `
+            -a ./dist/Bitwarden-${{ env.PACKAGE_VERSION }}-ia32.appx `
+            -a ./dist/Bitwarden-${{ env.PACKAGE_VERSION }}-x64.appx `
+            -a ./dist/Bitwarden-Portable-${{ env.PACKAGE_VERSION }}.exe `
+            -a ./dist/nsis-web/Bitwarden-Installer-${{ env.PACKAGE_VERSION }}.exe `
+            -m "$($env:RELEASE_TAG_NAME.TrimStart('v'))" `
+            $env:RELEASE_TAG_NAME
+        shell: pwsh
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          RELEASE_TAG_NAME: ${{ github.event.release.tag_name }}
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index d0fe4686..978200f1 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -1,16 +1,13 @@
 name: Build
 
-on: 
-  workflow_dispatch:
-    
-# on:
-#   push:
-#     branches-ignore:
-#       - 'l10n_master'
-#       - 'gh-pages'
-#   release:
-#     types:
-#       - published
+on:
+  push:
+    branches-ignore:
+      - 'l10n_master'
+      - 'gh-pages'
+  release:
+    types:
+      - published
 
 jobs:
 
@@ -214,22 +211,21 @@ jobs:
       #     name: bitwarden.${{ env.PACKAGE_VERSION }}.nupkg
       #     path: ./dist/chocolatey/bitwarden.${{ env.PACKAGE_VERSION }}.nupkg
 
-      #- name: Upload release assets
-      #  if: github.event_name == 'release'
-      #  run: |
-      #    hub release edit `
-      #      -a ./dist/Bitwarden-${{ env.PACKAGE_VERSION }}-ia32-store.appx `
-      #      -a ./dist/Bitwarden-${{ env.PACKAGE_VERSION }}-x64-store.appx `
-      #      -m "$($env:RELEASE_TAG_NAME.TrimStart('v'))" `
-      #      $env:RELEASE_TAG_NAME
-      #  shell: pwsh
-      #  env:
-      #    GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
-      #    RELEASE_TAG_NAME: ${{ github.event.release.tag_name }}
+      - name: Upload release assets
+        if: github.event_name == 'release'
+        run: |
+          hub release edit `
+            -a ./dist/Bitwarden-${{ env.PACKAGE_VERSION }}-ia32-store.appx `
+            -a ./dist/Bitwarden-${{ env.PACKAGE_VERSION }}-x64-store.appx `
+            -m "$($env:RELEASE_TAG_NAME.TrimStart('v'))" `
+            $env:RELEASE_TAG_NAME
+        shell: pwsh
+        env:
+          GITHUB_TOKEN: ${{ secrets.GH_TOKEN }}
+          RELEASE_TAG_NAME: ${{ github.event.release.tag_name }}
 
   macos:
     runs-on: macos-latest
-
     steps:
       - name: Set up Node
         uses: actions/setup-node@v1
diff --git a/appveyor.yml b/appveyor.yml.flagged-to-remove
similarity index 100%
rename from appveyor.yml
rename to appveyor.yml.flagged-to-remove