From e9fe6b9831324b65815817fa548772260398843e Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Thu, 7 Sep 2023 21:10:46 +0200 Subject: [PATCH] Partial revert of unneeded code. It doesn't work out this way, and, due to the if-clause further on, it should work even if the 'need's aren't all met. part of CURA-9494 --- .github/workflows/installers.yml | 100 ++++++++++++++----------------- 1 file changed, 45 insertions(+), 55 deletions(-) diff --git a/.github/workflows/installers.yml b/.github/workflows/installers.yml index 766c174ed1..2fc4b76d41 100644 --- a/.github/workflows/installers.yml +++ b/.github/workflows/installers.yml @@ -45,73 +45,63 @@ env: jobs: windows-installer: - steps: - - name: Build Windows installer - if: ${{ contains(inputs.os_list, 'windows') }} - uses: ./.github/workflows/windows.yml - with: - cura_conan_version: ${{ inputs.cura_conan_version }} - conan_args: ${{ inputs.conan_args }} - enterprise: ${{ inputs.enterprise }} - staging: ${{ inputs.staging }} - architecture: X64 - operating_system: windows-2022 + if: ${{ contains(inputs.os_list, 'windows') }} + uses: ./.github/workflows/windows.yml + with: + cura_conan_version: ${{ inputs.cura_conan_version }} + conan_args: ${{ inputs.conan_args }} + enterprise: ${{ inputs.enterprise }} + staging: ${{ inputs.staging }} + architecture: X64 + operating_system: windows-2022 secrets: inherit linux-modern-installer: - steps: - - name: Build (modern) Linux installer - if: ${{ contains(inputs.os_list, 'linux-modern') }} - uses: ./.github/workflows/linux.yml - with: - cura_conan_version: ${{ inputs.cura_conan_version }} - conan_args: ${{ inputs.conan_args }} - enterprise: ${{ inputs.enterprise }} - staging: ${{ inputs.staging }} - architecture: X64 - operating_system: ubuntu-22.04 + if: ${{ contains(inputs.os_list, 'linux-modern') }} + uses: ./.github/workflows/linux.yml + with: + cura_conan_version: ${{ inputs.cura_conan_version }} + conan_args: ${{ inputs.conan_args }} + enterprise: ${{ inputs.enterprise }} + staging: ${{ inputs.staging }} + architecture: X64 + operating_system: ubuntu-22.04 secrets: inherit linux-legacy-installer: - steps: - - name: Build (legacy) Linux installer - if: ${{ contains(inputs.os_list, 'linux-legacy') }} - uses: ./.github/workflows/linux.yml - with: - cura_conan_version: ${{ inputs.cura_conan_version }} - conan_args: ${{ inputs.conan_args }} - enterprise: ${{ inputs.enterprise }} - staging: ${{ inputs.staging }} - architecture: X64 - operating_system: ubuntu-20.04 + if: ${{ contains(inputs.os_list, 'linux-legacy') }} + uses: ./.github/workflows/linux.yml + with: + cura_conan_version: ${{ inputs.cura_conan_version }} + conan_args: ${{ inputs.conan_args }} + enterprise: ${{ inputs.enterprise }} + staging: ${{ inputs.staging }} + architecture: X64 + operating_system: ubuntu-20.04 secrets: inherit macos-installer: - steps: - - name: Build MacOS installer for Intel chips - if: ${{ contains(inputs.os_list, 'macos-x64') }} - uses: ./.github/workflows/macos.yml - with: - cura_conan_version: ${{ inputs.cura_conan_version }} - conan_args: ${{ inputs.conan_args }} - enterprise: ${{ inputs.enterprise }} - staging: ${{ inputs.staging }} - architecture: X64 - operating_system: macos-11.0 + if: ${{ contains(inputs.os_list, 'macos-x64') }} + uses: ./.github/workflows/macos.yml + with: + cura_conan_version: ${{ inputs.cura_conan_version }} + conan_args: ${{ inputs.conan_args }} + enterprise: ${{ inputs.enterprise }} + staging: ${{ inputs.staging }} + architecture: X64 + operating_system: macos-11.0 secrets: inherit macos-arm-installer: - steps: - - name: Build MacOS installer for ARM chips - if: ${{ contains(inputs.os_list, 'macos-arm64') }} - uses: ./.github/workflows/macos.yml - with: - cura_conan_version: ${{ inputs.cura_conan_version }} - conan_args: ${{ inputs.conan_args }} - enterprise: ${{ inputs.enterprise }} - staging: ${{ inputs.staging }} - architecture: ARM64 - operating_system: self-hosted + if: ${{ contains(inputs.os_list, 'macos-arm64') }} + uses: ./.github/workflows/macos.yml + with: + cura_conan_version: ${{ inputs.cura_conan_version }} + conan_args: ${{ inputs.conan_args }} + enterprise: ${{ inputs.enterprise }} + staging: ${{ inputs.staging }} + architecture: ARM64 + operating_system: self-hosted secrets: inherit # Run and update nightly release when the nightly input is set to true or if the schedule is triggered