From 53a9f43e5caba105a4e49fde13cba4b419ddbd3e Mon Sep 17 00:00:00 2001
From: Jelle Spijker <j.spijker@ultimaker.com>
Date: Fri, 6 Jan 2023 14:47:56 +0100
Subject: [PATCH] IDK

---
 .github/workflows/cura-all-installers.yml |  6 +++++-
 .github/workflows/cura-installer.yml      | 16 ++++++++++------
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/cura-all-installers.yml b/.github/workflows/cura-all-installers.yml
index 03ad65f7d4..22a9fada72 100644
--- a/.github/workflows/cura-all-installers.yml
+++ b/.github/workflows/cura-all-installers.yml
@@ -72,6 +72,7 @@ jobs:
             enterprise: ${{ inputs.enterprise }}
             staging: ${{ inputs.staging }}
             installer: ${{ inputs.installer }}
+            msi_installer: false
         secrets: inherit
 
     windows-installer-create-msi:
@@ -86,7 +87,7 @@ jobs:
             enterprise: ${{ inputs.enterprise }}
             staging: ${{ inputs.staging }}
             installer: ${{ inputs.installer }}
-            msi: true
+            msi_installer: true
         secrets: inherit
 
     linux-installer-create:
@@ -101,6 +102,7 @@ jobs:
             enterprise: ${{ inputs.enterprise }}
             staging: ${{ inputs.staging }}
             installer: ${{ inputs.installer }}
+            msi_installer: false
         secrets: inherit
 
     linux-modern-installer-create:
@@ -115,6 +117,7 @@ jobs:
             enterprise: ${{ inputs.enterprise }}
             staging: ${{ inputs.staging }}
             installer: ${{ inputs.installer }}
+            msi_installer: false
         secrets: inherit
 
     macos-installer-create:
@@ -129,4 +132,5 @@ jobs:
             enterprise: ${{ inputs.enterprise }}
             staging: ${{ inputs.staging }}
             installer: ${{ inputs.installer }}
+            msi_installer: false
         secrets: inherit
diff --git a/.github/workflows/cura-installer.yml b/.github/workflows/cura-installer.yml
index 940bfe7e35..223cfdac08 100644
--- a/.github/workflows/cura-installer.yml
+++ b/.github/workflows/cura-installer.yml
@@ -44,10 +44,10 @@ on:
                 default: true
                 required: true
                 type: boolean
-            msi:
+            msi_installer:
                 description: 'Create the msi'
                 default: false
-                required: false
+                required: true
                 type: boolean
 
 env:
@@ -80,6 +80,10 @@ jobs:
             -   name: Checkout
                 uses: actions/checkout@v3
 
+            -   name: blerk
+                if: ${{ runner.os == 'Windows' }}
+                run: echo ${{  github.event.inputs.msi_installer }}
+
             -   name: Setup Python and pip
                 uses: actions/setup-python@v4
                 with:
@@ -240,19 +244,19 @@ jobs:
                 working-directory: dist
 
             -   name: Create the Windows exe installer (Powershell)
-                if: ${{ github.event.inputs.installer == 'true' && runner.os == 'Windows' && github.event.inputs.msi == 'false' }}
+                if: ${{ github.event.inputs.installer == 'true' && runner.os == 'Windows' && github.event.inputs.msi_installer == 'false' }}
                 run: |
                     python ..\cura_inst\packaging\NSIS\create_windows_installer.py ../cura_inst . "UltiMaker-Cura-$Env:CURA_VERSION_FULL-${{ inputs.os_name }}.exe"
                 working-directory: dist
 
             -   name: Create the Windows msi installer (Powershell)
-                if: ${{ github.event.inputs.installer == 'true' && runner.os == 'Windows' && github.event.inputs.msi == 'true' }}
+                if: ${{ github.event.inputs.installer == 'true' && runner.os == 'Windows' && github.event.inputs.msi_installer == 'true' }}
                 run: |
                     python ..\cura_inst\packaging\msi\create_windows_msi.py ..\cura_inst .\UltiMaker-Cura "UltiMaker-Cura-$Env:CURA_VERSION_FULL-${{ inputs.os_name }}.msi" "$Env:CURA_APP_NAME"
                 working-directory: dist
 
             -   name: Sign the Windows exe installer (Powershell)
-                if: ${{ github.event.inputs.installer == 'true' && runner.os == 'Windows' &&github.event.inputs.msi == 'false'  }}
+                if: ${{ github.event.inputs.installer == 'true' && runner.os == 'Windows' && github.event.inputs.msi_installer == 'false'  }}
                 env:
                     PFX_PATH: ${{ steps.create-pfx.outputs.PFX_PATH }}
                 run: |
@@ -260,7 +264,7 @@ jobs:
                 working-directory: dist
 
             -   name: Sign the Windows msi installer (Powershell)
-                if: ${{ github.event.inputs.installer == 'true' && runner.os == 'Windows' && github.event.inputs.msi == 'true' }}
+                if: ${{ github.event.inputs.installer == 'true' && runner.os == 'Windows' && github.event.inputs.msi_installer == 'true' }}
                 env:
                     PFX_PATH: ${{ steps.create-pfx.outputs.PFX_PATH }}
                 run: |