From fc961737f47c5e5dbe849e3cec8e31482d5cf19f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Telaty=C5=84ski?= <7t3chguy@gmail.com>
Date: Mon, 27 Feb 2023 09:52:47 +0000
Subject: [PATCH] Fix build_and_deploy workflow (#553)

---
 .github/workflows/build_and_deploy.yaml | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/build_and_deploy.yaml b/.github/workflows/build_and_deploy.yaml
index 608d4a8..a0faeda 100644
--- a/.github/workflows/build_and_deploy.yaml
+++ b/.github/workflows/build_and_deploy.yaml
@@ -7,7 +7,7 @@ on:
     workflow_dispatch:
         inputs:
             mode:
-                description: What type of build to trigger. Release builds should be ran from the `master` branch.
+                description: What type of build to trigger. Release builds MUST be ran from the `master` branch.
                 required: true
                 default: nightly
                 type: choice
@@ -15,27 +15,27 @@ on:
                     - nightly
                     - release
             macos:
-                description: Whether to build macOS
+                description: Build macOS
                 required: true
                 type: boolean
                 default: true
             windows_32bit:
-                description: Whether to build Windows 32-bit
+                description: Build Windows 32-bit
                 required: true
                 type: boolean
                 default: true
             windows_64bit:
-                description: Whether to build Windows 64-bit
+                description: Build Windows 64-bit
                 required: true
                 type: boolean
                 default: true
             linux:
-                description: Whether to build Linux
+                description: Build Linux
                 required: true
                 type: boolean
                 default: true
             deploy:
-                description: Whether to deploy artifacts
+                description: Deploy artifacts
                 required: true
                 type: boolean
                 default: true
@@ -107,6 +107,7 @@ jobs:
     deploy:
         needs:
             - macos
+            - linux
             - windows_32bit
             - windows_64bit
         runs-on: ubuntu-latest
@@ -131,7 +132,7 @@ jobs:
                   R2_URL: ${{ secrets.CF_R2_S3_API }}
 
             - name: Deploy artifacts
-              if: github.event_name != 'workflow_dispatch' || inputs.macos
+              if: github.event_name != 'workflow_dispatch' || inputs.macos || inputs.windows_32bit || inputs.windows_64bit
               run: |
                   aws s3 cp --recursive packages.element.io/ s3://$R2_BUCKET/$DEPLOYMENT_DIR --endpoint-url $R2_URL --region auto
               env: