GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-05-03 17:24:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use single quotes or 'if' doesn't work.

Browse Source 
part of CURA-9494
This commit is contained in:
Remco Burema 2023-09-07 20:48:33 +02:00
parent 13af77b4f6
commit a35ce3d652
1 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
.github/workflows/installers.yml vendored
View File

@ -47,7 +47,7 @@ jobs:
windows-installer: windows-installer:
steps: steps:
- name: Build Windows installer - name: Build Windows installer
if: ${{ contains(inputs.os_list, "windows") }} if: ${{ contains(inputs.os_list, 'windows') }}
uses: ./.github/workflows/windows.yml uses: ./.github/workflows/windows.yml
with: with:
cura_conan_version: ${{ inputs.cura_conan_version }} cura_conan_version: ${{ inputs.cura_conan_version }}
@ -61,7 +61,7 @@ jobs:
linux-modern-installer: linux-modern-installer:
steps: steps:
- name: Build (modern) Linux installer - name: Build (modern) Linux installer
if: ${{ contains(inputs.os_list, "linux-modern") }} if: ${{ contains(inputs.os_list, 'linux-modern') }}
uses: ./.github/workflows/linux.yml uses: ./.github/workflows/linux.yml
with: with:
cura_conan_version: ${{ inputs.cura_conan_version }} cura_conan_version: ${{ inputs.cura_conan_version }}
@ -75,7 +75,7 @@ jobs:
linux-legacy-installer: linux-legacy-installer:
steps: steps:
- name: Build (legacy) Linux installer - name: Build (legacy) Linux installer
if: ${{ contains(inputs.os_list, "linux-legacy") }} if: ${{ contains(inputs.os_list, 'linux-legacy') }}
uses: ./.github/workflows/linux.yml uses: ./.github/workflows/linux.yml
with: with:
cura_conan_version: ${{ inputs.cura_conan_version }} cura_conan_version: ${{ inputs.cura_conan_version }}
@ -89,7 +89,7 @@ jobs:
macos-installer: macos-installer:
steps: steps:
- name: Build MacOS installer for Intel chips - name: Build MacOS installer for Intel chips
if: ${{ contains(inputs.os_list, "macos-x64") }} if: ${{ contains(inputs.os_list, 'macos-x64') }}
uses: ./.github/workflows/macos.yml uses: ./.github/workflows/macos.yml
with: with:
cura_conan_version: ${{ inputs.cura_conan_version }} cura_conan_version: ${{ inputs.cura_conan_version }}
@ -103,7 +103,7 @@ jobs:
macos-arm-installer: macos-arm-installer:
steps: steps:
- name: Build MacOS installer for ARM chips - name: Build MacOS installer for ARM chips
if: ${{ contains(inputs.os_list, "macos-arm64") }} if: ${{ contains(inputs.os_list, 'macos-arm64') }}
uses: ./.github/workflows/macos.yml uses: ./.github/workflows/macos.yml
with: with:
cura_conan_version: ${{ inputs.cura_conan_version }} cura_conan_version: ${{ inputs.cura_conan_version }}
@ -140,17 +140,17 @@ jobs:
import datetime import datetime
enterprise = "-Enterprise" if "${{ inputs.enterprise }}" == "true" else "" enterprise = "-Enterprise" if "${{ inputs.enterprise }}" == "true" else ""
os_list = [x.strip() for x in "${{ inputs.os_list }}".split(",")] os_list = [x.strip() for x in "${{ inputs.os_list }}".split(",")]
if "linux-modern" in os_list: if 'linux-modern' in os_list:
linux_modern = f"UltiMaker-Cura-{os.getenv('CURA_VERSION_FULL')}{enterprise}-linux-modern-X64" linux_modern = f"UltiMaker-Cura-{os.getenv('CURA_VERSION_FULL')}{enterprise}-linux-modern-X64"
if "linux-legacy" in os_list: if 'linux-legacy' in os_list:
linux_legacy = f"UltiMaker-Cura-{os.getenv('CURA_VERSION_FULL')}{enterprise}-linux-X64" linux_legacy = f"UltiMaker-Cura-{os.getenv('CURA_VERSION_FULL')}{enterprise}-linux-X64"
if "macos-x64" in os_list: if 'macos-x64' in os_list:
mac_x64_dmg = f"UltiMaker-Cura-{os.getenv('CURA_VERSION_FULL')}{enterprise}-macos-X64" mac_x64_dmg = f"UltiMaker-Cura-{os.getenv('CURA_VERSION_FULL')}{enterprise}-macos-X64"
mac_x64_pkg = f"UltiMaker-Cura-{os.getenv('CURA_VERSION_FULL')}{enterprise}-macos-X64" mac_x64_pkg = f"UltiMaker-Cura-{os.getenv('CURA_VERSION_FULL')}{enterprise}-macos-X64"
if "macos-arm64" in os_list: if 'macos-arm64' in os_list:
mac_arm_dmg = f"UltiMaker-Cura-{os.getenv('CURA_VERSION_FULL')}{enterprise}-macos-ARM64" mac_arm_dmg = f"UltiMaker-Cura-{os.getenv('CURA_VERSION_FULL')}{enterprise}-macos-ARM64"
mac_arm_pkg = f"UltiMaker-Cura-{os.getenv('CURA_VERSION_FULL')}{enterprise}-macos-ARM64" mac_arm_pkg = f"UltiMaker-Cura-{os.getenv('CURA_VERSION_FULL')}{enterprise}-macos-ARM64"
if "windows" in os_list: if 'windows' in os_list:
win_msi = installer_filename = f"UltiMaker-Cura-{os.getenv('CURA_VERSION_FULL')}{enterprise}-win64-X64" win_msi = installer_filename = f"UltiMaker-Cura-{os.getenv('CURA_VERSION_FULL')}{enterprise}-win64-X64"
win_exe = installer_filename = f"UltiMaker-Cura-{os.getenv('CURA_VERSION_FULL')}{enterprise}-win64-X64" win_exe = installer_filename = f"UltiMaker-Cura-{os.getenv('CURA_VERSION_FULL')}{enterprise}-win64-X64"
nightly_name = "UltiMaker-Cura-" + os.getenv('CURA_VERSION_FULL').split("+")[0] nightly_name = "UltiMaker-Cura-" + os.getenv('CURA_VERSION_FULL').split("+")[0]
@ -162,122 +162,122 @@ jobs:
content = f.read() content = f.read()
with open(output_env, "w") as f: with open(output_env, "w") as f:
f.write(content) f.write(content)
if "linux-modern" in os_list: if 'linux-modern' in os_list:
f.writelines(f"LINUX_MODERN={linux_modern}\n") f.writelines(f"LINUX_MODERN={linux_modern}\n")
if "linux-legacy" in os_list: if 'linux-legacy' in os_list:
f.writelines(f"LINUX_LEGACY={linux_legacy}\n") f.writelines(f"LINUX_LEGACY={linux_legacy}\n")
if "macos-x64" in os_list: if 'macos-x64' in os_list:
f.writelines(f"MAC_X64_DMG={mac_x64_dmg}\n") f.writelines(f"MAC_X64_DMG={mac_x64_dmg}\n")
f.writelines(f"MAC_X64_PKG={mac_x64_pkg}\n") f.writelines(f"MAC_X64_PKG={mac_x64_pkg}\n")
if "macos-arm64" in os_list: if 'macos-arm64' in os_list:
f.writelines(f"MAC_ARM_DMG={mac_arm_dmg}\n") f.writelines(f"MAC_ARM_DMG={mac_arm_dmg}\n")
f.writelines(f"MAC_ARM_PKG={mac_arm_pkg}\n") f.writelines(f"MAC_ARM_PKG={mac_arm_pkg}\n")
if "windows" in os_list: if 'windows' in os_list:
f.writelines(f"WIN_MSI={win_msi}\n") f.writelines(f"WIN_MSI={win_msi}\n")
f.writelines(f"WIN_EXE={win_exe}\n") f.writelines(f"WIN_EXE={win_exe}\n")
f.writelines(f"NIGHTLY_NAME={nightly_name}\n") f.writelines(f"NIGHTLY_NAME={nightly_name}\n")
f.writelines(f"NIGHTLY_TIME={nightly_creation_time}\n") f.writelines(f"NIGHTLY_TIME={nightly_creation_time}\n")
- name: Download linux modern installer jobs artifacts - name: Download linux modern installer jobs artifacts
if: ${{ contains(inputs.os_list, "linux-modern") }} if: ${{ contains(inputs.os_list, 'linux-modern') }}
uses: actions/download-artifact@v2 uses: actions/download-artifact@v2
with: with:
name: ${{ steps.filename.outputs.LINUX_MODERN }}-AppImage name: ${{ steps.filename.outputs.LINUX_MODERN }}-AppImage
path: installers path: installers
- name: Download linux legacy installer jobs artifacts - name: Download linux legacy installer jobs artifacts
if: ${{ contains(inputs.os_list, "linux-legacy") }} if: ${{ contains(inputs.os_list, 'linux-legacy') }}
uses: actions/download-artifact@v2 uses: actions/download-artifact@v2
with: with:
name: ${{ steps.filename.outputs.LINUX_LEGACY }}-AppImage name: ${{ steps.filename.outputs.LINUX_LEGACY }}-AppImage
path: installers path: installers
- name: Download mac x64 dmg installer jobs artifacts - name: Download mac x64 dmg installer jobs artifacts
if: ${{ contains(inputs.os_list, "macos-x64") }} if: ${{ contains(inputs.os_list, 'macos-x64') }}
uses: actions/download-artifact@v2 uses: actions/download-artifact@v2
with: with:
name: ${{ steps.filename.outputs.MAC_X64_DMG }}-dmg name: ${{ steps.filename.outputs.MAC_X64_DMG }}-dmg
path: installers path: installers
- name: Download mac x64 pkg installer jobs artifacts - name: Download mac x64 pkg installer jobs artifacts
if: ${{ contains(inputs.os_list, "macos-x64") }} if: ${{ contains(inputs.os_list, 'macos-x64') }}
uses: actions/download-artifact@v2 uses: actions/download-artifact@v2
with: with:
name: ${{ steps.filename.outputs.MAC_X64_PKG }}-pkg name: ${{ steps.filename.outputs.MAC_X64_PKG }}-pkg
path: installers path: installers
- name: Download mac arm dmg installer jobs artifacts - name: Download mac arm dmg installer jobs artifacts
if: ${{ contains(inputs.os_list, "macos-arm64") }} if: ${{ contains(inputs.os_list, 'macos-arm64') }}
uses: actions/download-artifact@v2 uses: actions/download-artifact@v2
with: with:
name: ${{ steps.filename.outputs.MAC_ARM_DMG }}-dmg name: ${{ steps.filename.outputs.MAC_ARM_DMG }}-dmg
path: installers path: installers
- name: Download mac arm pkg installer jobs artifacts - name: Download mac arm pkg installer jobs artifacts
if: ${{ contains(inputs.os_list, "macos-arm64") }} if: ${{ contains(inputs.os_list, 'macos-arm64') }}
uses: actions/download-artifact@v2 uses: actions/download-artifact@v2
with: with:
name: ${{ steps.filename.outputs.MAC_ARM_PKG }}-pkg name: ${{ steps.filename.outputs.MAC_ARM_PKG }}-pkg
path: installers path: installers
- name: Download win msi installer jobs artifacts - name: Download win msi installer jobs artifacts
if: ${{ contains(inputs.os_list, "windows") }} if: ${{ contains(inputs.os_list, 'windows') }}
uses: actions/download-artifact@v2 uses: actions/download-artifact@v2
with: with:
name: ${{ steps.filename.outputs.WIN_MSI }}-msi name: ${{ steps.filename.outputs.WIN_MSI }}-msi
path: installers path: installers
- name: Download win exe installer jobs artifacts - name: Download win exe installer jobs artifacts
if: ${{ contains(inputs.os_list, "windows") }} if: ${{ contains(inputs.os_list, 'windows') }}
uses: actions/download-artifact@v2 uses: actions/download-artifact@v2
with: with:
name: ${{ steps.filename.outputs.WIN_EXE }}-exe name: ${{ steps.filename.outputs.WIN_EXE }}-exe
path: installers path: installers
- name: Rename Linux (modern) installer to nightlies - name: Rename Linux (modern) installer to nightlies
if: ${{ contains(inputs.os_list, "linux-modern") }} if: ${{ contains(inputs.os_list, 'linux-modern') }}
run: | run: |
mv installers/${{ steps.filename.outputs.LINUX_MODERN }}.AppImage installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-linux-modern-X64.AppImage mv installers/${{ steps.filename.outputs.LINUX_MODERN }}.AppImage installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-linux-modern-X64.AppImage
- name: Rename Linux (legacy) installer to nightlies - name: Rename Linux (legacy) installer to nightlies
if: ${{ contains(inputs.os_list, "linux-legacy") }} if: ${{ contains(inputs.os_list, 'linux-legacy') }}
run: | run: |
mv installers/${{ steps.filename.outputs.LINUX_LEGACY }}.AppImage installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-linux-X64.AppImage mv installers/${{ steps.filename.outputs.LINUX_LEGACY }}.AppImage installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-linux-X64.AppImage
- name: Rename MacOS (X64) installers to nightlies - name: Rename MacOS (X64) installers to nightlies
if: ${{ contains(inputs.os_list, "macos-x64") }} if: ${{ contains(inputs.os_list, 'macos-x64') }}
run: | run: |
mv installers/${{ steps.filename.outputs.MAC_X64_DMG }}.dmg installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-macos-X64.dmg mv installers/${{ steps.filename.outputs.MAC_X64_DMG }}.dmg installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-macos-X64.dmg
mv installers/${{ steps.filename.outputs.MAC_X64_PKG }}.pkg installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-macos-X64.pkg mv installers/${{ steps.filename.outputs.MAC_X64_PKG }}.pkg installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-macos-X64.pkg
- name: Rename MacOS (ARM-64) installers to nightlies - name: Rename MacOS (ARM-64) installers to nightlies
if: ${{ contains(inputs.os_list, "macos-arm64") }} if: ${{ contains(inputs.os_list, 'macos-arm64') }}
run: | run: |
mv installers/${{ steps.filename.outputs.MAC_ARM_DMG }}.dmg installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-macos-ARM64.dmg mv installers/${{ steps.filename.outputs.MAC_ARM_DMG }}.dmg installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-macos-ARM64.dmg
mv installers/${{ steps.filename.outputs.MAC_ARM_PKG }}.pkg installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-macos-ARM64.pkg mv installers/${{ steps.filename.outputs.MAC_ARM_PKG }}.pkg installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-macos-ARM64.pkg
- name: Rename Windows installers to nightlies - name: Rename Windows installers to nightlies
if: ${{ contains(inputs.os_list, "windows") }} if: ${{ contains(inputs.os_list, 'windows') }}
run: | run: |
mv installers/${{ steps.filename.outputs.WIN_MSI }}.msi installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-win64-X64.msi mv installers/${{ steps.filename.outputs.WIN_MSI }}.msi installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-win64-X64.msi
mv installers/${{ steps.filename.outputs.WIN_EXE }}.exe installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-win64-X64.exe mv installers/${{ steps.filename.outputs.WIN_EXE }}.exe installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-win64-X64.exe
- name: Update nightly release for Linux (modern) - name: Update nightly release for Linux (modern)
if: ${{ contains(inputs.os_list, "linux-modern") }} if: ${{ contains(inputs.os_list, 'linux-modern') }}
run: | run: |
gh release upload nightly installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-linux-modern-X64.AppImage --clobber gh release upload nightly installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-linux-modern-X64.AppImage --clobber
env: env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Update nightly release for Linux (legacy) - name: Update nightly release for Linux (legacy)
if: ${{ contains(inputs.os_list, "linux-legacy") }} if: ${{ contains(inputs.os_list, 'linux-legacy') }}
run: | run: |
gh release upload nightly installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-linux-X64.AppImage --clobber gh release upload nightly installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-linux-X64.AppImage --clobber
env: env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Update nightly release for MacOS (X64) - name: Update nightly release for MacOS (X64)
if: ${{ contains(inputs.os_list, "macos-x64") }} if: ${{ contains(inputs.os_list, 'macos-x64') }}
run: | run: |
gh release upload nightly installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-macos-X64.dmg --clobber gh release upload nightly installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-macos-X64.dmg --clobber
gh release upload nightly installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-macos-X64.pkg --clobber gh release upload nightly installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-macos-X64.pkg --clobber
@ -285,7 +285,7 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Update nightly release for MacOS (ARM-64) - name: Update nightly release for MacOS (ARM-64)
if: ${{ contains(inputs.os_list, "macos-arm64") }} if: ${{ contains(inputs.os_list, 'macos-arm64') }}
run: | run: |
gh release upload nightly installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-macos-ARM64.dmg --clobber gh release upload nightly installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-macos-ARM64.dmg --clobber
gh release upload nightly installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-macos-ARM64.pkg --clobber gh release upload nightly installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-macos-ARM64.pkg --clobber
@ -293,7 +293,7 @@ jobs:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: Update nightly release for Windows - name: Update nightly release for Windows
if: ${{ contains(inputs.os_list, "windows") }} if: ${{ contains(inputs.os_list, 'windows') }}
run: | run: |
gh release upload nightly installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-win64-X64.msi --clobber gh release upload nightly installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-win64-X64.msi --clobber
gh release upload nightly installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-win64-X64.exe --clobber gh release upload nightly installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-win64-X64.exe --clobber