From e25730ad77f60be4f067faa8c0bd1f1fbe5d4fbd Mon Sep 17 00:00:00 2001 From: Joey de l'Arago Date: Thu, 12 Jan 2023 14:15:53 +0100 Subject: [PATCH] We hit the max 10 inputs for the workflow. Remove the pkg input and use the msi one temporarily instead. CURA-6867 --- .github/workflows/cura-all-installers.yml | 10 ++-------- .github/workflows/cura-installer.yml | 7 +------ 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/.github/workflows/cura-all-installers.yml b/.github/workflows/cura-all-installers.yml index 7f0002894a..4729c4198a 100644 --- a/.github/workflows/cura-all-installers.yml +++ b/.github/workflows/cura-all-installers.yml @@ -40,7 +40,7 @@ on: required: true type: boolean build_windows_msi: - description: 'Build for Windows msi' + description: 'Build for msi+pkg' default: true required: true type: boolean @@ -54,11 +54,6 @@ on: default: true required: true type: boolean - build_macos_installer: - description: 'Build pkg for MacOS' - default: true - required: true - type: boolean # Run the nightly at 3:25 UTC on working days schedule: @@ -152,6 +147,5 @@ jobs: enterprise: ${{ inputs.enterprise }} staging: ${{ inputs.staging }} installer: ${{ inputs.installer }} - msi_installer: false - pkg_installer: true + msi_installer: true secrets: inherit diff --git a/.github/workflows/cura-installer.yml b/.github/workflows/cura-installer.yml index e96f1ca781..aeae82e114 100644 --- a/.github/workflows/cura-installer.yml +++ b/.github/workflows/cura-installer.yml @@ -49,11 +49,6 @@ on: default: false required: true type: boolean - pkg_installer: - description: 'Create the pkg' - default: false - required: true - type: boolean env: CONAN_LOGIN_USERNAME_CURA: ${{ secrets.CONAN_USER }} @@ -256,7 +251,7 @@ jobs: if "${{ runner.os }}" == "Windows": installer_ext = "msi" if "${{ inputs.msi_installer }}" == "true" else "exe" elif "${{ runner.os }}" == "macOS": - installer_ext = "pkg" if "${{ inputs.pkg_installer }}" == "true" else "dmg" + installer_ext = "pkg" if "${{ inputs.mis_installer }}" == "true" else "dmg" else: installer_ext = "AppImage" output_env = os.environ["GITHUB_OUTPUT"]