From 553ce41d0158dfc7081a7c722156e02087f3f72c Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Mon, 11 Sep 2023 10:01:11 +0200 Subject: [PATCH] Use default values for nightlies Contributes to CURA-10998 --- .github/workflows/installers.yml | 104 ++++++++++++++++--------------- 1 file changed, 53 insertions(+), 51 deletions(-) diff --git a/.github/workflows/installers.yml b/.github/workflows/installers.yml index 8f9f5690aa..79e97df79c 100644 --- a/.github/workflows/installers.yml +++ b/.github/workflows/installers.yml @@ -39,67 +39,69 @@ on: - cron: '20 4 * * *' env: - CURA_CONAN_VERSION: ${{ inputs.cura_conan_version }} - ENTERPRISE: ${{ inputs.enterprise }} - STAGING: ${{ inputs.staging }} + CURA_CONAN_VERSION: ${{ inputs.cura_conan_version || 'cura/latest@ultimaker/testing' }} + CONAN_ARGS: ${{ inputs.conan_args || '' }} + ENTERPRISE: ${{ inputs.enterprise || false }} + STAGING: ${{ inputs.staging || false }} + OS_LIST: ${{ inputs.os_list || 'windows, linux-modern, linux-legacy, macos-x64, macos-arm64' }} jobs: windows-installer: - if: ${{ contains(inputs.os_list, 'windows') || github.event_name == 'schedule' }} + if: ${{ contains(env.OS_LIST, 'windows') || github.event_name == 'schedule' }} uses: ./.github/workflows/windows.yml with: - cura_conan_version: ${{ inputs.cura_conan_version }} - conan_args: ${{ inputs.conan_args }} - enterprise: ${{ inputs.enterprise }} - staging: ${{ inputs.staging }} + cura_conan_version: ${{ env.CURA_CONAN_VERSION }} + conan_args: ${{ env.CONAN_ARGS }} + enterprise: ${{ env.ENTERPRISE }} + staging: ${{ env.STAGING }} architecture: X64 operating_system: windows-2022 secrets: inherit linux-modern-installer: - if: ${{ contains(inputs.os_list, 'linux-modern') || github.event_name == 'schedule' }} + if: ${{ contains(env.OS_LIST, 'linux-modern') || github.event_name == 'schedule' }} uses: ./.github/workflows/linux.yml with: - cura_conan_version: ${{ inputs.cura_conan_version }} - conan_args: ${{ inputs.conan_args }} - enterprise: ${{ inputs.enterprise }} - staging: ${{ inputs.staging }} + cura_conan_version: ${{ env.CURA_CONAN_VERSION }} + conan_args: ${{ env.CONAN_ARGS }} + enterprise: ${{ env.ENTERPRISE }} + staging: ${{ env.STAGING }} architecture: X64 operating_system: ubuntu-22.04 secrets: inherit linux-legacy-installer: - if: ${{ contains(inputs.os_list, 'linux-legacy') || github.event_name == 'schedule' }} + if: ${{ contains(env.OS_LIST, 'linux-legacy') || github.event_name == 'schedule' }} uses: ./.github/workflows/linux.yml with: - cura_conan_version: ${{ inputs.cura_conan_version }} - conan_args: ${{ inputs.conan_args }} - enterprise: ${{ inputs.enterprise }} - staging: ${{ inputs.staging }} + cura_conan_version: ${{ env.CURA_CONAN_VERSION }} + conan_args: ${{ env.CONAN_ARGS }} + enterprise: ${{ env.ENTERPRISE }} + staging: ${{ env.STAGING }} architecture: X64 operating_system: ubuntu-20.04 secrets: inherit macos-installer: - if: ${{ contains(inputs.os_list, 'macos-x64') }} + if: ${{ contains(env.OS_LIST, 'macos-x64') || github.event_name == 'schedule' }} uses: ./.github/workflows/macos.yml with: - cura_conan_version: ${{ inputs.cura_conan_version }} - conan_args: ${{ inputs.conan_args }} - enterprise: ${{ inputs.enterprise }} - staging: ${{ inputs.staging }} + cura_conan_version: ${{ env.CURA_CONAN_VERSION }} + conan_args: ${{ env.CONAN_ARGS }} + enterprise: ${{ env.ENTERPRISE }} + staging: ${{ env.STAGING }} architecture: X64 operating_system: macos-11.0 secrets: inherit macos-arm-installer: - if: ${{ contains(inputs.os_list, 'macos-arm64') }} + if: ${{ contains(env.OS_LIST, 'macos-arm64') || github.event_name == 'schedule' }} uses: ./.github/workflows/macos.yml with: - cura_conan_version: ${{ inputs.cura_conan_version }} - conan_args: ${{ inputs.conan_args }} - enterprise: ${{ inputs.enterprise }} - staging: ${{ inputs.staging }} + cura_conan_version: ${{ env.CURA_CONAN_VERSION }} + conan_args: ${{ env.CONAN_ARGS }} + enterprise: ${{ env.ENTERPRISE }} + staging: ${{ env.STAGING }} architecture: ARM64 operating_system: self-hosted secrets: inherit @@ -116,19 +118,19 @@ jobs: # It's not necessary to download all three, but it does make sure we have at least one if an OS is skipped. - name: Download the run info - if: ${{ contains(inputs.os_list, 'macos-x64') || contains(inputs.os_list, 'macos-arm64') }} + if: ${{ contains(env.OS_LIST, 'macos-x64') || contains(inputs.os_list, 'macos-arm64') }} uses: actions/download-artifact@v2 with: name: macos-run-info - name: Download the run info II - if: ${{ contains(inputs.os_list, 'linux-modern') || contains(inputs.os_list, 'linux-legacy') || github.event_name == 'schedule' }} + if: contains(env.OS_LIST, 'linux-modern') || contains(inputs.os_list, 'linux-legacy') }} uses: actions/download-artifact@v2 with: name: linux-run-info - name: Download the run info III - if: ${{ contains(inputs.os_list, 'windows') || github.event_name == 'schedule' }} + if: contains(env.OS_LIST, windows') }} uses: actions/download-artifact@v2 with: name: windows-run-info @@ -143,8 +145,8 @@ jobs: run: | import os import datetime - enterprise = "-Enterprise" if "${{ inputs.enterprise }}" == "true" else "" - os_list = [x.strip() for x in "${{ inputs.os_list }}".split(",")] + enterprise = "-Enterprise" if "${{ env.ENTERPRISE }}" == "true" else "" + os_list = [x.strip() for x in "${{ env.OS_LIST }}".split(",")] scheduled = "${{ github.event_name == 'schedule' }}" == "true" if 'linux-modern' in os_list or scheduled: linux_modern = f"UltiMaker-Cura-{os.getenv('CURA_VERSION_FULL')}{enterprise}-linux-modern-X64" @@ -185,105 +187,105 @@ jobs: f.writelines(f"NIGHTLY_TIME={nightly_creation_time}\n") - name: Download linux modern installer jobs artifacts - if: ${{ contains(inputs.os_list, 'linux-modern') || github.event_name == 'schedule' }} + if: ${{ contains(env.OS_LIST, 'linux-modern') }} uses: actions/download-artifact@v2 with: name: ${{ steps.filename.outputs.LINUX_MODERN }}-AppImage path: installers - name: Download linux legacy installer jobs artifacts - if: ${{ contains(inputs.os_list, 'linux-legacy') || github.event_name == 'schedule'}} + if: ${{ contains(env.OS_LIST, 'linux-legacy') }} uses: actions/download-artifact@v2 with: name: ${{ steps.filename.outputs.LINUX_LEGACY }}-AppImage path: installers - name: Download mac x64 dmg installer jobs artifacts - if: ${{ contains(inputs.os_list, 'macos-x64') }} + if: ${{ contains(env.OS_LIST, 'macos-x64') }} uses: actions/download-artifact@v2 with: name: ${{ steps.filename.outputs.MAC_X64_DMG }}-dmg path: installers - name: Download mac x64 pkg installer jobs artifacts - if: ${{ contains(inputs.os_list, 'macos-x64') }} + if: ${{ contains(env.OS_LIST, 'macos-x64') }} uses: actions/download-artifact@v2 with: name: ${{ steps.filename.outputs.MAC_X64_PKG }}-pkg path: installers - name: Download mac arm dmg installer jobs artifacts - if: ${{ contains(inputs.os_list, 'macos-arm64') }} + if: ${{ contains(env.OS_LIST, 'macos-arm64') }} uses: actions/download-artifact@v2 with: name: ${{ steps.filename.outputs.MAC_ARM_DMG }}-dmg path: installers - name: Download mac arm pkg installer jobs artifacts - if: ${{ contains(inputs.os_list, 'macos-arm64') }} + if: ${{ contains(env.OS_LIST, 'macos-arm64') }} uses: actions/download-artifact@v2 with: name: ${{ steps.filename.outputs.MAC_ARM_PKG }}-pkg path: installers - name: Download win msi installer jobs artifacts - if: ${{ contains(inputs.os_list, 'windows') || github.event_name == 'schedule' }} + if: ${{ contains(env.OS_LIST, 'windows') }} uses: actions/download-artifact@v2 with: name: ${{ steps.filename.outputs.WIN_MSI }}-msi path: installers - name: Download win exe installer jobs artifacts - if: ${{ contains(inputs.os_list, 'windows') || github.event_name == 'schedule' }} + if: ${{ contains(env.OS_LIST, 'windows') }} uses: actions/download-artifact@v2 with: name: ${{ steps.filename.outputs.WIN_EXE }}-exe path: installers - name: Rename Linux (modern) installer to nightlies - if: ${{ contains(inputs.os_list, 'linux-modern') || github.event_name == 'schedule' }} + if: ${{ contains(env.OS_LIST, 'linux-modern') }} run: | 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 - if: ${{ contains(inputs.os_list, 'linux-legacy') || github.event_name == 'schedule' }} + if: ${{ contains(env.OS_LIST, 'linux-legacy') }} run: | mv installers/${{ steps.filename.outputs.LINUX_LEGACY }}.AppImage installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-linux-X64.AppImage - name: Rename MacOS (X64) installers to nightlies - if: ${{ contains(inputs.os_list, 'macos-x64') }} + if: ${{ contains(env.OS_LIST, 'macos-x64') }} 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_PKG }}.pkg installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-macos-X64.pkg - name: Rename MacOS (ARM-64) installers to nightlies - if: ${{ contains(inputs.os_list, 'macos-arm64') }} + if: ${{ contains(env.OS_LIST, 'macos-arm64') }} 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_PKG }}.pkg installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-macos-ARM64.pkg - name: Rename Windows installers to nightlies - if: ${{ contains(inputs.os_list, 'windows') || github.event_name == 'schedule' }} + if: ${{ contains(env.OS_LIST, 'windows') }} run: | 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 - name: Update nightly release for Linux (modern) - if: ${{ contains(inputs.os_list, 'linux-modern') || github.event_name == 'schedule' }} + if: ${{ contains(env.OS_LIST, 'linux-modern') }} run: | gh release upload nightly installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-linux-modern-X64.AppImage --clobber env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Update nightly release for Linux (legacy) - if: ${{ contains(inputs.os_list, 'linux-legacy') || github.event_name == 'schedule' }} + if: ${{ contains(env.OS_LIST, 'linux-legacy') }} run: | gh release upload nightly installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-linux-X64.AppImage --clobber env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Update nightly release for MacOS (X64) - if: ${{ contains(inputs.os_list, 'macos-x64') }} + if: ${{ contains(env.OS_LIST, 'macos-x64') }} 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.pkg --clobber @@ -291,7 +293,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Update nightly release for MacOS (ARM-64) - if: ${{ contains(inputs.os_list, 'macos-arm64') }} + if: ${{ contains(env.OS_LIST, 'macos-arm64') }} 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.pkg --clobber @@ -299,7 +301,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Update nightly release for Windows - if: ${{ contains(inputs.os_list, 'windows') || github.event_name == 'schedule' }} + if: ${{ contains(env.OS_LIST, 'windows') }} 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.exe --clobber