From 553ce41d0158dfc7081a7c722156e02087f3f72c Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Mon, 11 Sep 2023 10:01:11 +0200 Subject: [PATCH 1/8] 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 From 965a30775d56106353482d59d82780105bb8b177 Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Mon, 11 Sep 2023 10:07:09 +0200 Subject: [PATCH 2/8] Use `github.event.inputs` Contributes to CURA-10998 --- .github/workflows/installers.yml | 52 ++++++++++++++++---------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/.github/workflows/installers.yml b/.github/workflows/installers.yml index 79e97df79c..ce69f15528 100644 --- a/.github/workflows/installers.yml +++ b/.github/workflows/installers.yml @@ -47,7 +47,7 @@ env: jobs: windows-installer: - if: ${{ contains(env.OS_LIST, 'windows') || github.event_name == 'schedule' }} + if: ${{ contains(github.event.inputs.os_list, 'windows') || github.event_name == 'schedule' }} uses: ./.github/workflows/windows.yml with: cura_conan_version: ${{ env.CURA_CONAN_VERSION }} @@ -59,7 +59,7 @@ jobs: secrets: inherit linux-modern-installer: - if: ${{ contains(env.OS_LIST, 'linux-modern') || github.event_name == 'schedule' }} + if: ${{ contains(github.event.inputs.os_list, 'linux-modern') || github.event_name == 'schedule' }} uses: ./.github/workflows/linux.yml with: cura_conan_version: ${{ env.CURA_CONAN_VERSION }} @@ -71,7 +71,7 @@ jobs: secrets: inherit linux-legacy-installer: - if: ${{ contains(env.OS_LIST, 'linux-legacy') || github.event_name == 'schedule' }} + if: ${{ contains(github.event.inputs.os_list, 'linux-legacy') || github.event_name == 'schedule' }} uses: ./.github/workflows/linux.yml with: cura_conan_version: ${{ env.CURA_CONAN_VERSION }} @@ -83,7 +83,7 @@ jobs: secrets: inherit macos-installer: - if: ${{ contains(env.OS_LIST, 'macos-x64') || github.event_name == 'schedule' }} + if: ${{ contains(github.event.inputs.os_list, 'macos-x64') || github.event_name == 'schedule' }} uses: ./.github/workflows/macos.yml with: cura_conan_version: ${{ env.CURA_CONAN_VERSION }} @@ -95,7 +95,7 @@ jobs: secrets: inherit macos-arm-installer: - if: ${{ contains(env.OS_LIST, 'macos-arm64') || github.event_name == 'schedule' }} + if: ${{ contains(github.event.inputs.os_list, 'macos-arm64') || github.event_name == 'schedule' }} uses: ./.github/workflows/macos.yml with: cura_conan_version: ${{ env.CURA_CONAN_VERSION }} @@ -118,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(env.OS_LIST, 'macos-x64') || contains(inputs.os_list, 'macos-arm64') }} + if: ${{ contains(github.event.inputs.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(env.OS_LIST, 'linux-modern') || contains(inputs.os_list, 'linux-legacy') }} + if: contains(github.event.inputs.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(env.OS_LIST, windows') }} + if: contains(github.event.inputs.os_list, windows') }} uses: actions/download-artifact@v2 with: name: windows-run-info @@ -187,105 +187,105 @@ jobs: f.writelines(f"NIGHTLY_TIME={nightly_creation_time}\n") - name: Download linux modern installer jobs artifacts - if: ${{ contains(env.OS_LIST, 'linux-modern') }} + if: ${{ contains(github.event.inputs.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(env.OS_LIST, 'linux-legacy') }} + if: ${{ contains(github.event.inputs.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(env.OS_LIST, 'macos-x64') }} + if: ${{ contains(github.event.inputs.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(env.OS_LIST, 'macos-x64') }} + if: ${{ contains(github.event.inputs.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(env.OS_LIST, 'macos-arm64') }} + if: ${{ contains(github.event.inputs.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(env.OS_LIST, 'macos-arm64') }} + if: ${{ contains(github.event.inputs.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(env.OS_LIST, 'windows') }} + if: ${{ contains(github.event.inputs.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(env.OS_LIST, 'windows') }} + if: ${{ contains(github.event.inputs.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(env.OS_LIST, 'linux-modern') }} + if: ${{ contains(github.event.inputs.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(env.OS_LIST, 'linux-legacy') }} + if: ${{ contains(github.event.inputs.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(env.OS_LIST, 'macos-x64') }} + if: ${{ contains(github.event.inputs.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(env.OS_LIST, 'macos-arm64') }} + if: ${{ contains(github.event.inputs.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(env.OS_LIST, 'windows') }} + if: ${{ contains(github.event.inputs.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(env.OS_LIST, 'linux-modern') }} + if: ${{ contains(github.event.inputs.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(env.OS_LIST, 'linux-legacy') }} + if: ${{ contains(github.event.inputs.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(env.OS_LIST, 'macos-x64') }} + if: ${{ contains(github.event.inputs.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 @@ -293,7 +293,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Update nightly release for MacOS (ARM-64) - if: ${{ contains(env.OS_LIST, 'macos-arm64') }} + if: ${{ contains(github.event.inputs.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 @@ -301,7 +301,7 @@ jobs: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Update nightly release for Windows - if: ${{ contains(env.OS_LIST, 'windows') }} + if: ${{ contains(github.event.inputs.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 From e586fca22e504a4388309b67a428c19138348afe Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Mon, 11 Sep 2023 10:08:33 +0200 Subject: [PATCH 3/8] Use `github.event.inputs` Contributes to CURA-10998 --- .github/workflows/installers.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/installers.yml b/.github/workflows/installers.yml index ce69f15528..28f4dab0f7 100644 --- a/.github/workflows/installers.yml +++ b/.github/workflows/installers.yml @@ -50,10 +50,10 @@ jobs: if: ${{ contains(github.event.inputs.os_list, 'windows') || github.event_name == 'schedule' }} uses: ./.github/workflows/windows.yml with: - cura_conan_version: ${{ env.CURA_CONAN_VERSION }} - conan_args: ${{ env.CONAN_ARGS }} - enterprise: ${{ env.ENTERPRISE }} - staging: ${{ env.STAGING }} + cura_conan_version: ${{ github.event.inputs.CURA_CONAN_VERSION }} + conan_args: ${{ github.event.inputs.CONAN_ARGS }} + enterprise: ${{ github.event.inputs.ENTERPRISE }} + staging: ${{ github.event.inputs.STAGING }} architecture: X64 operating_system: windows-2022 secrets: inherit From c9bc1963e4cd6b47c2f074222accf2710cca3b27 Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Mon, 11 Sep 2023 10:11:21 +0200 Subject: [PATCH 4/8] Use `github.event.inputs` Contributes to CURA-10998 --- .github/workflows/installers.yml | 38 ++++++++++++++++---------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/.github/workflows/installers.yml b/.github/workflows/installers.yml index 28f4dab0f7..7208df4426 100644 --- a/.github/workflows/installers.yml +++ b/.github/workflows/installers.yml @@ -51,9 +51,9 @@ jobs: uses: ./.github/workflows/windows.yml with: cura_conan_version: ${{ github.event.inputs.CURA_CONAN_VERSION }} - conan_args: ${{ github.event.inputs.CONAN_ARGS }} - enterprise: ${{ github.event.inputs.ENTERPRISE }} - staging: ${{ github.event.inputs.STAGING }} + conan_args: ${{ github.event.inputs.conan_args }} + enterprise: ${{ github.event.inputs.enterprise }} + staging: ${{ github.event.inputs.staging }} architecture: X64 operating_system: windows-2022 secrets: inherit @@ -62,10 +62,10 @@ jobs: if: ${{ contains(github.event.inputs.os_list, 'linux-modern') || github.event_name == 'schedule' }} uses: ./.github/workflows/linux.yml with: - cura_conan_version: ${{ env.CURA_CONAN_VERSION }} - conan_args: ${{ env.CONAN_ARGS }} - enterprise: ${{ env.ENTERPRISE }} - staging: ${{ env.STAGING }} + cura_conan_version: ${{ github.event.inputs.CURA_CONAN_VERSION }} + conan_args: ${{ github.event.inputs.conan_args }} + enterprise: ${{ github.event.inputs.enterprise }} + staging: ${{ github.event.inputs.staging }} architecture: X64 operating_system: ubuntu-22.04 secrets: inherit @@ -74,10 +74,10 @@ jobs: if: ${{ contains(github.event.inputs.os_list, 'linux-legacy') || github.event_name == 'schedule' }} uses: ./.github/workflows/linux.yml with: - cura_conan_version: ${{ env.CURA_CONAN_VERSION }} - conan_args: ${{ env.CONAN_ARGS }} - enterprise: ${{ env.ENTERPRISE }} - staging: ${{ env.STAGING }} + cura_conan_version: ${{ github.event.inputs.CURA_CONAN_VERSION }} + conan_args: ${{ github.event.inputs.conan_args }} + enterprise: ${{ github.event.inputs.enterprise }} + staging: ${{ github.event.inputs.staging }} architecture: X64 operating_system: ubuntu-20.04 secrets: inherit @@ -86,10 +86,10 @@ jobs: if: ${{ contains(github.event.inputs.os_list, 'macos-x64') || github.event_name == 'schedule' }} uses: ./.github/workflows/macos.yml with: - cura_conan_version: ${{ env.CURA_CONAN_VERSION }} - conan_args: ${{ env.CONAN_ARGS }} - enterprise: ${{ env.ENTERPRISE }} - staging: ${{ env.STAGING }} + cura_conan_version: ${{ github.event.inputs.CURA_CONAN_VERSION }} + conan_args: ${{ github.event.inputs.conan_args }} + enterprise: ${{ github.event.inputs.enterprise }} + staging: ${{ github.event.inputs.staging }} architecture: X64 operating_system: macos-11.0 secrets: inherit @@ -98,10 +98,10 @@ jobs: if: ${{ contains(github.event.inputs.os_list, 'macos-arm64') || github.event_name == 'schedule' }} uses: ./.github/workflows/macos.yml with: - cura_conan_version: ${{ env.CURA_CONAN_VERSION }} - conan_args: ${{ env.CONAN_ARGS }} - enterprise: ${{ env.ENTERPRISE }} - staging: ${{ env.STAGING }} + cura_conan_version: ${{ github.event.inputs.CURA_CONAN_VERSION }} + conan_args: ${{ github.event.inputs.conan_args }} + enterprise: ${{ github.event.inputs.enterprise }} + staging: ${{ github.event.inputs.staging }} architecture: ARM64 operating_system: self-hosted secrets: inherit From 4c8f8c8a00214d00820789e9dd1784b3807c5397 Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Mon, 11 Sep 2023 10:12:48 +0200 Subject: [PATCH 5/8] fixed missing start of context Contributes to CURA-10998 --- .github/workflows/installers.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/installers.yml b/.github/workflows/installers.yml index 7208df4426..403f8f9cb4 100644 --- a/.github/workflows/installers.yml +++ b/.github/workflows/installers.yml @@ -124,7 +124,7 @@ jobs: name: macos-run-info - name: Download the run info II - if: contains(github.event.inputs.os_list, 'linux-modern') || contains(inputs.os_list, 'linux-legacy') }} + if: ${{ contains(github.event.inputs.os_list, 'linux-modern') || contains(inputs.os_list, 'linux-legacy') }} uses: actions/download-artifact@v2 with: name: linux-run-info From d1e4e018b9b3a70ae38e5f976eabcd540b60a50f Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Mon, 11 Sep 2023 10:13:54 +0200 Subject: [PATCH 6/8] fixed missing start of context Contributes to CURA-10998 --- .github/workflows/installers.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/installers.yml b/.github/workflows/installers.yml index 403f8f9cb4..ca7455678a 100644 --- a/.github/workflows/installers.yml +++ b/.github/workflows/installers.yml @@ -130,7 +130,7 @@ jobs: name: linux-run-info - name: Download the run info III - if: contains(github.event.inputs.os_list, windows') }} + if: ${{ contains(github.event.inputs.os_list, windows') }} uses: actions/download-artifact@v2 with: name: windows-run-info From 7a3d852d41b45a4c6d551f6bf75be3bc7c1c9d6d Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Mon, 11 Sep 2023 10:18:32 +0200 Subject: [PATCH 7/8] fixed syntax erros Contributes to CURA-10998 --- .github/workflows/installers.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/installers.yml b/.github/workflows/installers.yml index ca7455678a..d7dc34c735 100644 --- a/.github/workflows/installers.yml +++ b/.github/workflows/installers.yml @@ -118,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(github.event.inputs.os_list, 'macos-x64') || contains(inputs.os_list, 'macos-arm64') }} + if: ${{ contains(github.event.inputs.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(github.event.inputs.os_list, 'linux-modern') || contains(inputs.os_list, 'linux-legacy') }} + if: ${{ contains(github.event.inputs.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(github.event.inputs.os_list, windows') }} + if: ${{ contains(github.event.inputs.os_list, 'windows') }} uses: actions/download-artifact@v2 with: name: windows-run-info From 312c2a5bb292783d99b4167b773d2f4d285ba1c5 Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Mon, 11 Sep 2023 10:20:43 +0200 Subject: [PATCH 8/8] github.event.inputs are strings Contributes to CURA-10998 --- .github/workflows/installers.yml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/.github/workflows/installers.yml b/.github/workflows/installers.yml index d7dc34c735..93fa12c43e 100644 --- a/.github/workflows/installers.yml +++ b/.github/workflows/installers.yml @@ -52,8 +52,8 @@ jobs: with: cura_conan_version: ${{ github.event.inputs.CURA_CONAN_VERSION }} conan_args: ${{ github.event.inputs.conan_args }} - enterprise: ${{ github.event.inputs.enterprise }} - staging: ${{ github.event.inputs.staging }} + enterprise: ${{ github.event.inputs.enterprise == 'true' }} + staging: ${{ github.event.inputs.staging == 'true' }} architecture: X64 operating_system: windows-2022 secrets: inherit @@ -64,8 +64,8 @@ jobs: with: cura_conan_version: ${{ github.event.inputs.CURA_CONAN_VERSION }} conan_args: ${{ github.event.inputs.conan_args }} - enterprise: ${{ github.event.inputs.enterprise }} - staging: ${{ github.event.inputs.staging }} + enterprise: ${{ github.event.inputs.enterprise == 'true' }} + staging: ${{ github.event.inputs.staging == 'true' }} architecture: X64 operating_system: ubuntu-22.04 secrets: inherit @@ -76,8 +76,8 @@ jobs: with: cura_conan_version: ${{ github.event.inputs.CURA_CONAN_VERSION }} conan_args: ${{ github.event.inputs.conan_args }} - enterprise: ${{ github.event.inputs.enterprise }} - staging: ${{ github.event.inputs.staging }} + enterprise: ${{ github.event.inputs.enterprise == 'true' }} + staging: ${{ github.event.inputs.staging == 'true' }} architecture: X64 operating_system: ubuntu-20.04 secrets: inherit @@ -88,8 +88,8 @@ jobs: with: cura_conan_version: ${{ github.event.inputs.CURA_CONAN_VERSION }} conan_args: ${{ github.event.inputs.conan_args }} - enterprise: ${{ github.event.inputs.enterprise }} - staging: ${{ github.event.inputs.staging }} + enterprise: ${{ github.event.inputs.enterprise == 'true' }} + staging: ${{ github.event.inputs.staging == 'true' }} architecture: X64 operating_system: macos-11.0 secrets: inherit @@ -100,8 +100,8 @@ jobs: with: cura_conan_version: ${{ github.event.inputs.CURA_CONAN_VERSION }} conan_args: ${{ github.event.inputs.conan_args }} - enterprise: ${{ github.event.inputs.enterprise }} - staging: ${{ github.event.inputs.staging }} + enterprise: ${{ github.event.inputs.enterprise == 'true' }} + staging: ${{ github.event.inputs.staging == 'true' }} architecture: ARM64 operating_system: self-hosted secrets: inherit