From 7a629fb221c6d1156b42ddcb584706ac827f8c0f Mon Sep 17 00:00:00 2001
From: Devin Binnie <52460000+devinbinnie@users.noreply.github.com>
Date: Thu, 10 Mar 2022 12:58:25 -0500
Subject: [PATCH] Update nightly job (#2015)

---
 .circleci/config.yml | 26 +++++---------------------
 1 file changed, 5 insertions(+), 21 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index aed30093..70dd5d95 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -425,28 +425,12 @@ jobs:
           name: "Setup files for aws-s3"
           command: |
             mkdir -p ./aws-s3-dist
-            cp --backup=numbered ./build/{macos-release,win-release,linux}/* ./aws-s3-dist
+            cp -r --backup=numbered ./build/{macos-release,win-release,linux}/* ./aws-s3-dist
       - aws-s3/copy:
           from: ./aws-s3-dist/
           to: s3://releases.mattermost.com/desktop/
           arguments: --acl public-read --cache-control "no-cache" --recursive
 
-  upload_to_s3_daily:
-    executor: aws
-    steps:
-      - checkout
-      - attach_workspace:
-          at: ./build
-      - run:
-          name: "Setup files for aws-s3"
-          command: |
-            mkdir -p ./aws-s3-dist
-            cp -r --backup=numbered ./build/{macos-release,win,linux}/* ./aws-s3-dist
-      - aws-s3/copy:
-          from: ./aws-s3-dist/
-          to: s3://mattermost-desktop-daily-builds/
-          arguments: --acl public-read --cache-control "no-cache" --recursive
-
   upload_to_github:
     executor: github
     steps:
@@ -629,8 +613,8 @@ workflows:
     when: << pipeline.parameters.run_nightly >>
     jobs:
       - build-linux
-      - build-win-no-installer:
-          context: electron-installer
+      - msi_installer:
+          context: windows-codesign
       - mac_installer:
           context: codesign-certificates
       - store_artifacts:
@@ -638,13 +622,13 @@ workflows:
           # for master/PR builds
           requires:
             - build-linux
-            - build-win-no-installer
+            - msi_installer
             - mac_installer
       - upload_to_s3:
           context: mattermost-release-s3
           requires:
             - build-linux
-            - build-win-no-installer
+            - msi_installer
             - mac_installer
       - share_to_channel:
           context: desktop_browserview