From 2dbeba0c97772315dd13a6c6460143ef17720be1 Mon Sep 17 00:00:00 2001
From: Joseph Flinn <joseph.s.flinn@gmail.com>
Date: Mon, 1 Feb 2021 13:43:57 -0800
Subject: [PATCH] finishing the mac portion of splitting out the deploylments

---
 .github/workflows/deploy.yml  | 37 +++++++++++++++++++++++------------
 .github/workflows/release.yml | 13 +++++++-----
 package.json                  |  2 +-
 src/package.json              |  4 ++--
 4 files changed, 35 insertions(+), 21 deletions(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 5b4d4c10e8..bc5c96bb9f 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -66,8 +66,8 @@ jobs:
 
       - name: Install Snap
         uses: samuelmeuli/action-snapcraft@v1
-      #  with:
-      #    snapcraft_token: ${{ secrets.SNAP_TOKEN }}
+        with:
+          snapcraft_token: ${{ secrets.SNAP_TOKEN }}
 
       - name: setup
         run: mkdir dist
@@ -84,7 +84,6 @@ jobs:
         run: ls -alht dist
 
       - name: Deploy to Snap Store
-        if: false
         run: |
           snapcraft upload dist/bitwarden_${{ env.PACKAGE_VERSION }}_amd64.snap --release stable
           snapcraft logout
@@ -109,10 +108,10 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-      #- name: Setup Chocolatey
-      #  run: choco apikey --key $env:CHOCO_API_KEY --source https://push.chocolatey.org/
-      #  env:
-      #    CHOCO_API_KEY: ${{ secrets.CHOCO_API_KEY }}
+      - name: Setup Chocolatey
+        run: choco apikey --key $env:CHOCO_API_KEY --source https://push.chocolatey.org/
+        env:
+          CHOCO_API_KEY: ${{ secrets.CHOCO_API_KEY }}
 
       - name: make dist dir 
         shell: pwsh
@@ -127,20 +126,32 @@ jobs:
           github_token: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Push to Chocolatey
-        if: false
         shell: pwsh
         run: |
           cd dist
           choco push
 
 
-  # Placeholder until the build thing works with the directory-connector
   macos:
     runs-on: macos-latest
-    if: false
     needs: setup
     steps:
-      - name: Set up Node
-        uses: actions/setup-node@v1
+      - name: Checkout repo
+        uses: actions/checkout@v2
+
+      - name: make target directory
+        run: mkdir -p dist/mas
+
+      - name: Get mac release asset
+        uses: Xotl/cool-github-releases@v1
         with:
-          node-version: '10.x'
+          mode: download
+          tag_name: ${{ env.TAG_VERSION }}
+          assets: Bitwarden-${{ env.PACKAGE_VERSION }}.pkg|./dist/mas/Bitwarden-${{ env.PACKAGE_VERSION }}.pkg
+          github_token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Deploy to App Store
+        run: npm run upload:mas
+        env:
+          APPLE_ID_USERNAME: ${{ secrets.APPLE_ID_USERNAME }}
+          APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index aaa355ff59..d3198fb75f 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -181,7 +181,6 @@ jobs:
           choco pack ./dist/chocolatey/bitwarden.nuspec --version "$env:PACKAGE_VERSION" --out ./dist/chocolatey
           cd ./dist/chocolatey
           ls -alht dist/chocolatey
-          #choco push
 
       - name: Upload Chocolatey nupkg release asset
         uses: actions/upload-release-asset@v1
@@ -352,8 +351,12 @@ jobs:
           APPLE_ID_USERNAME: ${{ secrets.APPLE_ID_USERNAME }}
           APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
 
-      - name: Deploy to App Store
-        run: npm run upload:mas
+      - name: Upload Apple Store release asset
+        uses: actions/upload-release-asset@v1
         env:
-          APPLE_ID_USERNAME: ${{ secrets.APPLE_ID_USERNAME }}
-          APPLE_ID_PASSWORD: ${{ secrets.APPLE_ID_PASSWORD }}
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        with:
+          upload_url: ${{ needs.setup.outputs.release_upload_url }}
+          asset_name: Bitwarden-${{ env.PACKAGE_VERSION }}.pkg
+          asset_path: ./dist/mas/Bitwarden-${{ env.PACKAGE_VERSION }}.pkg
+          asset_content_type: application
diff --git a/package.json b/package.json
index 367839a0ae..0b6d033067 100644
--- a/package.json
+++ b/package.json
@@ -13,7 +13,7 @@
   "homepage": "https://bitwarden.com",
   "repository": {
     "type": "git",
-    "url": "https://github.com/joseph-flinn/desktop"
+    "url": "https://github.com/bitwarden/desktop"
   },
   "license": "GPL-3.0",
   "scripts": {
diff --git a/src/package.json b/src/package.json
index 13b1eeb250..af22216ae7 100644
--- a/src/package.json
+++ b/src/package.json
@@ -2,14 +2,14 @@
   "name": "bitwarden",
   "productName": "Bitwarden",
   "description": "A secure and free password manager for all of your devices.",
-  "version": "1.24.8",
+  "version": "1.24.6",
   "author": "Bitwarden Inc. <hello@bitwarden.com> (https://bitwarden.com)",
   "homepage": "https://bitwarden.com",
   "license": "GPL-3.0",
   "main": "main.js",
   "repository": {
     "type": "git",
-    "url": "https://github.com/joseph-flinn/desktop"
+    "url": "https://github.com/bitwarden/desktop"
   },
   "dependencies": {
     "@nodert-win10-rs4/windows.security.credentials.ui": "^0.4.4",