mirror of
https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura
synced 2025-08-13 01:49:03 +08:00
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
This commit is contained in:
parent
566fdfce1c
commit
e9fe6b9831
100
.github/workflows/installers.yml
vendored
100
.github/workflows/installers.yml
vendored
@ -45,73 +45,63 @@ env:
|
|||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
windows-installer:
|
windows-installer:
|
||||||
steps:
|
if: ${{ contains(inputs.os_list, 'windows') }}
|
||||||
- name: Build Windows installer
|
uses: ./.github/workflows/windows.yml
|
||||||
if: ${{ contains(inputs.os_list, 'windows') }}
|
with:
|
||||||
uses: ./.github/workflows/windows.yml
|
cura_conan_version: ${{ inputs.cura_conan_version }}
|
||||||
with:
|
conan_args: ${{ inputs.conan_args }}
|
||||||
cura_conan_version: ${{ inputs.cura_conan_version }}
|
enterprise: ${{ inputs.enterprise }}
|
||||||
conan_args: ${{ inputs.conan_args }}
|
staging: ${{ inputs.staging }}
|
||||||
enterprise: ${{ inputs.enterprise }}
|
architecture: X64
|
||||||
staging: ${{ inputs.staging }}
|
operating_system: windows-2022
|
||||||
architecture: X64
|
|
||||||
operating_system: windows-2022
|
|
||||||
secrets: inherit
|
secrets: inherit
|
||||||
|
|
||||||
linux-modern-installer:
|
linux-modern-installer:
|
||||||
steps:
|
if: ${{ contains(inputs.os_list, 'linux-modern') }}
|
||||||
- name: Build (modern) Linux installer
|
uses: ./.github/workflows/linux.yml
|
||||||
if: ${{ contains(inputs.os_list, 'linux-modern') }}
|
with:
|
||||||
uses: ./.github/workflows/linux.yml
|
cura_conan_version: ${{ inputs.cura_conan_version }}
|
||||||
with:
|
conan_args: ${{ inputs.conan_args }}
|
||||||
cura_conan_version: ${{ inputs.cura_conan_version }}
|
enterprise: ${{ inputs.enterprise }}
|
||||||
conan_args: ${{ inputs.conan_args }}
|
staging: ${{ inputs.staging }}
|
||||||
enterprise: ${{ inputs.enterprise }}
|
architecture: X64
|
||||||
staging: ${{ inputs.staging }}
|
operating_system: ubuntu-22.04
|
||||||
architecture: X64
|
|
||||||
operating_system: ubuntu-22.04
|
|
||||||
secrets: inherit
|
secrets: inherit
|
||||||
|
|
||||||
linux-legacy-installer:
|
linux-legacy-installer:
|
||||||
steps:
|
if: ${{ contains(inputs.os_list, 'linux-legacy') }}
|
||||||
- name: Build (legacy) Linux installer
|
uses: ./.github/workflows/linux.yml
|
||||||
if: ${{ contains(inputs.os_list, 'linux-legacy') }}
|
with:
|
||||||
uses: ./.github/workflows/linux.yml
|
cura_conan_version: ${{ inputs.cura_conan_version }}
|
||||||
with:
|
conan_args: ${{ inputs.conan_args }}
|
||||||
cura_conan_version: ${{ inputs.cura_conan_version }}
|
enterprise: ${{ inputs.enterprise }}
|
||||||
conan_args: ${{ inputs.conan_args }}
|
staging: ${{ inputs.staging }}
|
||||||
enterprise: ${{ inputs.enterprise }}
|
architecture: X64
|
||||||
staging: ${{ inputs.staging }}
|
operating_system: ubuntu-20.04
|
||||||
architecture: X64
|
|
||||||
operating_system: ubuntu-20.04
|
|
||||||
secrets: inherit
|
secrets: inherit
|
||||||
|
|
||||||
macos-installer:
|
macos-installer:
|
||||||
steps:
|
if: ${{ contains(inputs.os_list, 'macos-x64') }}
|
||||||
- name: Build MacOS installer for Intel chips
|
uses: ./.github/workflows/macos.yml
|
||||||
if: ${{ contains(inputs.os_list, 'macos-x64') }}
|
with:
|
||||||
uses: ./.github/workflows/macos.yml
|
cura_conan_version: ${{ inputs.cura_conan_version }}
|
||||||
with:
|
conan_args: ${{ inputs.conan_args }}
|
||||||
cura_conan_version: ${{ inputs.cura_conan_version }}
|
enterprise: ${{ inputs.enterprise }}
|
||||||
conan_args: ${{ inputs.conan_args }}
|
staging: ${{ inputs.staging }}
|
||||||
enterprise: ${{ inputs.enterprise }}
|
architecture: X64
|
||||||
staging: ${{ inputs.staging }}
|
operating_system: macos-11.0
|
||||||
architecture: X64
|
|
||||||
operating_system: macos-11.0
|
|
||||||
secrets: inherit
|
secrets: inherit
|
||||||
|
|
||||||
macos-arm-installer:
|
macos-arm-installer:
|
||||||
steps:
|
if: ${{ contains(inputs.os_list, 'macos-arm64') }}
|
||||||
- name: Build MacOS installer for ARM chips
|
uses: ./.github/workflows/macos.yml
|
||||||
if: ${{ contains(inputs.os_list, 'macos-arm64') }}
|
with:
|
||||||
uses: ./.github/workflows/macos.yml
|
cura_conan_version: ${{ inputs.cura_conan_version }}
|
||||||
with:
|
conan_args: ${{ inputs.conan_args }}
|
||||||
cura_conan_version: ${{ inputs.cura_conan_version }}
|
enterprise: ${{ inputs.enterprise }}
|
||||||
conan_args: ${{ inputs.conan_args }}
|
staging: ${{ inputs.staging }}
|
||||||
enterprise: ${{ inputs.enterprise }}
|
architecture: ARM64
|
||||||
staging: ${{ inputs.staging }}
|
operating_system: self-hosted
|
||||||
architecture: ARM64
|
|
||||||
operating_system: self-hosted
|
|
||||||
secrets: inherit
|
secrets: inherit
|
||||||
|
|
||||||
# Run and update nightly release when the nightly input is set to true or if the schedule is triggered
|
# Run and update nightly release when the nightly input is set to true or if the schedule is triggered
|
||||||
|
Loading…
x
Reference in New Issue
Block a user