From c4d78529e085a48609f615e46e5f09b1ed200b22 Mon Sep 17 00:00:00 2001 From: "j.spijker@ultimaker.com" Date: Fri, 8 Jul 2022 18:39:07 +0200 Subject: [PATCH 01/36] Use conan-recipe-version from CURA-9365 Contributes to CURA-9365 --- .github/workflows/conan-package.yml | 2 +- .github/workflows/unit-test.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/conan-package.yml b/.github/workflows/conan-package.yml index a2603dd345..fdf83eb3b1 100644 --- a/.github/workflows/conan-package.yml +++ b/.github/workflows/conan-package.yml @@ -48,7 +48,7 @@ on: jobs: conan-recipe-version: - uses: ultimaker/cura/.github/workflows/conan-recipe-version.yml@5.1 + uses: ultimaker/cura/.github/workflows/conan-recipe-version.yml@CURA-9365 with: project_name: cura diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index 157fa6cbba..df260ed8c2 100644 --- a/.github/workflows/unit-test.yml +++ b/.github/workflows/unit-test.yml @@ -62,7 +62,7 @@ env: jobs: conan-recipe-version: - uses: ultimaker/cura/.github/workflows/conan-recipe-version.yml@5.1 + uses: ultimaker/cura/.github/workflows/conan-recipe-version.yml@CURA-9365 with: project_name: cura From db67c1f66afb4402492ad4192be51c74e8676068 Mon Sep 17 00:00:00 2001 From: "j.spijker@ultimaker.com" Date: Fri, 8 Jul 2022 18:56:50 +0200 Subject: [PATCH 02/36] Don't run with the conan config for powershell Contributes to CURA-9365 --- .github/workflows/cura-installer.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cura-installer.yml b/.github/workflows/cura-installer.yml index f060062b9d..51c6a4cd9c 100644 --- a/.github/workflows/cura-installer.yml +++ b/.github/workflows/cura-installer.yml @@ -139,7 +139,7 @@ jobs: run: conan config install https://github.com/Ultimaker/conan-config.git - name: Create the Packages - run: conan install ${{ inputs.cura_conan_version }} --build=missing --update -c tools.env.virtualenv:powershell=True -if cura_inst -g VirtualPythonEnv -o cura:enterprise=${{ inputs.enterprise }} -o cura:staging=${{ inputs.staging }} --json "cura_inst/conan_install_info.json" + run: conan install ${{ inputs.cura_conan_version }} --build=missing --update -if cura_inst -g VirtualPythonEnv -o cura:enterprise=${{ inputs.enterprise }} -o cura:staging=${{ inputs.staging }} --json "cura_inst/conan_install_info.json" - name: Set Environment variables for Cura (bash) if: ${{ runner.os != 'Windows' }} From 19d62da737dead7e2957703872bd5ecc038ac29e Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Mon, 11 Jul 2022 00:05:15 +0200 Subject: [PATCH 03/36] Possible fix for Cura crashing on Zorin OS 16 Appearently the `QT_STYLE_OVERRIDE` variable is set for some users, crashing Cura. Unset variable `QT_STYLE_OVERRIDE` as a precaution https://github.com/Ultimaker/Cura/issues/12343 --- packaging/AppImage/AppRun | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packaging/AppImage/AppRun b/packaging/AppImage/AppRun index 5a134fa12d..d2beac8745 100644 --- a/packaging/AppImage/AppRun +++ b/packaging/AppImage/AppRun @@ -14,3 +14,7 @@ export QT_XKB_CONFIG_ROOT=/usr/share/X11/xkb export OPENSSL_CONF="$scriptdir/openssl.cnf" $scriptdir/Ultimaker-Cura "$@" + +# If this variable is set on Zorin OS 16 Cura would crash +# unset `QT_STYLE_OVERRIDE` as a precaution +unset QT_STYLE_OVERRIDE \ No newline at end of file From 5e40f2eaec25eaaa0f8f28979fa592e1fa2cf03c Mon Sep 17 00:00:00 2001 From: "j.spijker@ultimaker.com" Date: Mon, 11 Jul 2022 10:09:18 +0200 Subject: [PATCH 04/36] Build an AppImage with the latest Ubuntu Instead of trying to support multiple libstdc++ or ship or own (bad pratcice in general) an easy solution could be to provide two different AppImage's, were one is build on the latest Ubuntu runner. This should fix #11856 for the 5.1.0 release, but I don't consider this a permanent and/or sustainable solution. We should still create a ticket on the backlog to solves this issue in a more generic way and future-proof way. Contributes to CURA-9205 --- .github/workflows/cura-installer.yml | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/.github/workflows/cura-installer.yml b/.github/workflows/cura-installer.yml index 51c6a4cd9c..5a12e198f6 100644 --- a/.github/workflows/cura-installer.yml +++ b/.github/workflows/cura-installer.yml @@ -57,7 +57,11 @@ jobs: strategy: fail-fast: false matrix: - os: [ macos-10.15, windows-2022, ubuntu-20.04 ] + include: + - { os: macos-10.15, os_id: 'MacOS' } + - { os: windows-2022, os_id: 'Windows' } + - { os: ubuntu-20.04, os_id: 'Linux' } + - { os: ubuntu-latest, os_id: 'Linux-latest' } steps: - name: Checkout @@ -164,35 +168,35 @@ jobs: - name: Archive the artifacts (bash) if: ${{ github.event.inputs.installer == 'false' && runner.os != 'Windows' }} - run: tar -zcf "./Ultimaker-Cura-$CURA_VERSION_FULL-${{ runner.os }}-${{ runner.arch }}.tar.gz" "./Ultimaker-Cura/" + run: tar -zcf "./Ultimaker-Cura-$CURA_VERSION_FULL-${{ matrix.os_id }}-${{ runner.arch }}.tar.gz" "./Ultimaker-Cura/" working-directory: dist - name: Archive the artifacts (Powershell) if: ${{ github.event.inputs.installer == 'false' && runner.os == 'Windows' }} - run: Compress-Archive -Path ".\Ultimaker-Cura" -DestinationPath ".\Ultimaker-Cura-$Env:CURA_VERSION_FULL-${{ runner.os }}-${{ runner.arch }}.zip" + run: Compress-Archive -Path ".\Ultimaker-Cura" -DestinationPath ".\Ultimaker-Cura-$Env:CURA_VERSION_FULL-${{ matrix.os_id }}-${{ runner.arch }}.zip" working-directory: dist - name: Create the Windows exe installer (Powershell) if: ${{ github.event.inputs.installer == 'true' && runner.os == 'Windows' }} run: | - python ..\cura_inst\packaging\NSIS\nsis-configurator.py ".\Ultimaker-Cura" "..\cura_inst\packaging\NSIS\Ultimaker-Cura.nsi.jinja" "Ultimaker Cura" "Ultimaker-Cura.exe" "$Env:CURA_VERSION_MAJOR" "$Env:CURA_VERSION_MINOR" "$Env:CURA_VERSION_PATCH" "$Env:CURA_VERSION_BUILD" "Ultimaker B.V." "https://ultimaker.com" "..\cura_inst\packaging\cura_license.txt" "LZMA" "..\cura_inst\packaging\NSIS\cura_banner_nsis.bmp" "..\cura_inst\packaging\icons\Cura.ico" "Ultimaker-Cura-$Env:CURA_VERSION_FULL-${{ runner.os }}-${{ runner.arch }}.exe" + python ..\cura_inst\packaging\NSIS\nsis-configurator.py ".\Ultimaker-Cura" "..\cura_inst\packaging\NSIS\Ultimaker-Cura.nsi.jinja" "Ultimaker Cura" "Ultimaker-Cura.exe" "$Env:CURA_VERSION_MAJOR" "$Env:CURA_VERSION_MINOR" "$Env:CURA_VERSION_PATCH" "$Env:CURA_VERSION_BUILD" "Ultimaker B.V." "https://ultimaker.com" "..\cura_inst\packaging\cura_license.txt" "LZMA" "..\cura_inst\packaging\NSIS\cura_banner_nsis.bmp" "..\cura_inst\packaging\icons\Cura.ico" "Ultimaker-Cura-$Env:CURA_VERSION_FULL-${{ matrix.os_id }}-${{ runner.arch }}.exe" makensis /V2 /P4 Ultimaker-Cura.nsi working-directory: dist - name: Create the Linux AppImage (Bash) if: ${{ github.event.inputs.installer == 'true' && runner.os == 'Linux' }} - run: python ../cura_inst/packaging/AppImage/create_appimage.py ./Ultimaker-Cura $CURA_VERSION_FULL "Ultimaker-Cura-$CURA_VERSION_FULL-${{ runner.os }}-${{ runner.arch }}.AppImage" + run: python ../cura_inst/packaging/AppImage/create_appimage.py ./Ultimaker-Cura $CURA_VERSION_FULL "Ultimaker-Cura-$CURA_VERSION_FULL-${{ matrix.os_id }}-${{ runner.arch }}.AppImage" working-directory: dist - name: Create the MacOS dmg (Bash) if: ${{ github.event.inputs.installer == 'true' && runner.os == 'Macos' }} - run: python ../cura_inst/packaging/dmg/dmg_sign_noterize.py ../cura_inst . "Ultimaker-Cura-$CURA_VERSION_FULL-${{ runner.os }}-${{ runner.arch }}.dmg" + run: python ../cura_inst/packaging/dmg/dmg_sign_noterize.py ../cura_inst . "Ultimaker-Cura-$CURA_VERSION_FULL-${{ matrix.os_id }}-${{ runner.arch }}.dmg" working-directory: dist - name: Upload the artifacts uses: actions/upload-artifact@v3 with: - name: Ultimaker-Cura-${{ env.CURA_VERSION_FULL }}-${{ runner.os }}-${{ runner.arch }} + name: Ultimaker-Cura-${{ env.CURA_VERSION_FULL }}-${{ matrix.os_id }}-${{ runner.arch }} path: | dist/*.tar.gz dist/*.zip From 4c6ad9f4d6d83a25260b62d40fb52b7ba0e37a4e Mon Sep 17 00:00:00 2001 From: "j.spijker@ultimaker.com" Date: Mon, 11 Jul 2022 11:11:17 +0200 Subject: [PATCH 05/36] Specify Ubuntu 22.04 explicitly The latest points to 22.04, which is the latest stable GH runner Contributes to CURA-9205 --- .github/workflows/cura-installer.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cura-installer.yml b/.github/workflows/cura-installer.yml index 5a12e198f6..828042e2b2 100644 --- a/.github/workflows/cura-installer.yml +++ b/.github/workflows/cura-installer.yml @@ -61,7 +61,7 @@ jobs: - { os: macos-10.15, os_id: 'MacOS' } - { os: windows-2022, os_id: 'Windows' } - { os: ubuntu-20.04, os_id: 'Linux' } - - { os: ubuntu-latest, os_id: 'Linux-latest' } + - { os: ubuntu-22.04, os_id: 'Linux-latest' } steps: - name: Checkout From 479679b01821a14f4e4a86d2836eefa8413b18af Mon Sep 17 00:00:00 2001 From: "j.spijker@ultimaker.com" Date: Mon, 11 Jul 2022 12:04:15 +0200 Subject: [PATCH 06/36] Also add libegl-dev to Linux system req Contributes to CURA-9205 --- .github/workflows/cura-installer.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/cura-installer.yml b/.github/workflows/cura-installer.yml index 828042e2b2..8247fc2d47 100644 --- a/.github/workflows/cura-installer.yml +++ b/.github/workflows/cura-installer.yml @@ -113,7 +113,7 @@ jobs: - name: Install Linux system requirements if: ${{ runner.os == 'Linux' }} run: | - sudo apt install build-essential checkinstall zlib1g-dev libssl-dev ninja-build autoconf libx11-dev libx11-xcb-dev libfontenc-dev libice-dev libsm-dev libxau-dev libxaw7-dev libxcomposite-dev libxcursor-dev libxdamage-dev libxdmcp-dev libxext-dev libxfixes-dev libxi-dev libxinerama-dev libxkbfile-dev libxmu-dev libxmuu-dev libxpm-dev libxrandr-dev libxrender-dev libxres-dev libxss-dev libxt-dev libxtst-dev libxv-dev libxvmc-dev libxxf86vm-dev xtrans-dev libxcb-render0-dev libxcb-render-util0-dev libxcb-xkb-dev libxcb-icccm4-dev libxcb-image0-dev libxcb-keysyms1-dev libxcb-randr0-dev libxcb-shape0-dev libxcb-sync-dev libxcb-xfixes0-dev libxcb-xinerama0-dev xkb-data libxcb-dri3-dev uuid-dev libxcb-util-dev libxkbcommon-x11-dev -y + sudo apt install build-essential checkinstall libegl-dev zlib1g-dev libssl-dev ninja-build autoconf libx11-dev libx11-xcb-dev libfontenc-dev libice-dev libsm-dev libxau-dev libxaw7-dev libxcomposite-dev libxcursor-dev libxdamage-dev libxdmcp-dev libxext-dev libxfixes-dev libxi-dev libxinerama-dev libxkbfile-dev libxmu-dev libxmuu-dev libxpm-dev libxrandr-dev libxrender-dev libxres-dev libxss-dev libxt-dev libxtst-dev libxv-dev libxvmc-dev libxxf86vm-dev xtrans-dev libxcb-render0-dev libxcb-render-util0-dev libxcb-xkb-dev libxcb-icccm4-dev libxcb-image0-dev libxcb-keysyms1-dev libxcb-randr0-dev libxcb-shape0-dev libxcb-sync-dev libxcb-xfixes0-dev libxcb-xinerama0-dev xkb-data libxcb-dri3-dev uuid-dev libxcb-util-dev libxkbcommon-x11-dev -y wget --no-check-certificate --quiet https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage -O $GITHUB_WORKSPACE/appimagetool chmod +x $GITHUB_WORKSPACE/appimagetool echo "APPIMAGETOOL_LOCATION=$GITHUB_WORKSPACE/appimagetool" >> $GITHUB_ENV From 913d9b8ed7dc974afd50e5c6314857f1cd5522a1 Mon Sep 17 00:00:00 2001 From: "j.spijker@ultimaker.com" Date: Mon, 11 Jul 2022 15:41:15 +0200 Subject: [PATCH 07/36] Add serial to the hidden imports Should fix USB printing not working --- conandata.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/conandata.yml b/conandata.yml index 005bbf2671..756cb09db3 100644 --- a/conandata.yml +++ b/conandata.yml @@ -73,6 +73,7 @@ - "zeroconf" - "fcntl" - "stl" + - "serial" collect_all: - "cura" - "UM" @@ -164,6 +165,7 @@ - "zeroconf" - "fcntl" - "stl" + - "serial" collect_all: - "cura" - "UM" @@ -255,6 +257,7 @@ - "zeroconf" - "fcntl" - "stl" + - "serial" collect_all: - "cura" - "UM" From 656a3dc707b44422569a53ae4531325cf7833e21 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 11 Jul 2022 16:02:17 +0200 Subject: [PATCH 08/36] Remove stray print --- .../Recommended/RecommendedQualityProfileSelector.qml | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml index 87cb271ed4..bc5826fe7c 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedQualityProfileSelector.qml @@ -43,7 +43,6 @@ Item qualityType = Cura.MachineManager.activeQualityType } else { qualityType = Cura.MachineManager.getDefaultQualityTypeForIntent(model.intent_category) - print(Cura.MachineManager.getDefaultQualityTypeForIntent(model.intent_category)) } Cura.IntentManager.selectIntent(model.intent_category, qualityType) } From 461165ea39a0b146243141228cb0905c29c0bbb7 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 11 Jul 2022 16:16:08 +0200 Subject: [PATCH 09/36] Set the correct color for inactive text It used to be all back, which is just unreadable... CURA-9465 --- resources/themes/cura-dark/theme.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/themes/cura-dark/theme.json b/resources/themes/cura-dark/theme.json index 34696fb35e..36b7ea831b 100644 --- a/resources/themes/cura-dark/theme.json +++ b/resources/themes/cura-dark/theme.json @@ -81,7 +81,7 @@ "text": "text_default", "text_detail": [255, 255, 255, 172], "text_link": "accent_1", - "text_inactive": [255, 255, 255, 88], + "text_inactive": [118, 118, 118, 255], "text_hover": [255, 255, 255, 204], "text_scene": [255, 255, 255, 162], "text_scene_hover": [255, 255, 255, 204], From 6536b375256b35ce770d1e93e82a9a52c1e03c69 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 11 Jul 2022 16:19:26 +0200 Subject: [PATCH 10/36] Set background color for machine actions Otherwise the background is always white, which makes it unusuable for darktheme CURA-9465 --- resources/qml/Preferences/MachinesPage.qml | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/qml/Preferences/MachinesPage.qml b/resources/qml/Preferences/MachinesPage.qml index 9b6f5bf609..c77545bc03 100644 --- a/resources/qml/Preferences/MachinesPage.qml +++ b/resources/qml/Preferences/MachinesPage.qml @@ -92,6 +92,7 @@ UM.ManagementPage minimumHeight: UM.Theme.getSize("modal_window_minimum").height maximumWidth: minimumWidth * 3 maximumHeight: minimumHeight * 3 + backgroundColor: UM.Theme.getColor("main_background") } UM.ConfirmRemoveDialog From 32121c7adce3874767f5b520b9820f6e87046ce4 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 11 Jul 2022 16:21:10 +0200 Subject: [PATCH 11/36] Add background color for rename dialogs CURA-9465 --- resources/qml/Preferences/RenameDialog.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/qml/Preferences/RenameDialog.qml b/resources/qml/Preferences/RenameDialog.qml index 6e4c628114..7bcd65ed5d 100644 --- a/resources/qml/Preferences/RenameDialog.qml +++ b/resources/qml/Preferences/RenameDialog.qml @@ -23,7 +23,7 @@ UM.Dialog property string explanation: catalog.i18nc("@info", "Please provide a new name.") title: dialogTitle - + backgroundColor: UM.Theme.getColor("main_background") minimumWidth: UM.Theme.getSize("small_popup_dialog").width minimumHeight: UM.Theme.getSize("small_popup_dialog").height width: minimumWidth From 796f80c9b9eeebc1e699eba2f0be89d316fdce94 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 11 Jul 2022 16:38:37 +0200 Subject: [PATCH 12/36] Remove fill from settings icon Otherwise we can't use it in UM.ColorImage CURA-9465 --- resources/themes/cura-light/icons/default/Settings.svg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/themes/cura-light/icons/default/Settings.svg b/resources/themes/cura-light/icons/default/Settings.svg index 204f2a5b6f..22000feb16 100644 --- a/resources/themes/cura-light/icons/default/Settings.svg +++ b/resources/themes/cura-light/icons/default/Settings.svg @@ -1,3 +1,3 @@ - + From fdd96b30a7c96e3786e95d3b055da4ac76fc638e Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 11 Jul 2022 17:18:01 +0200 Subject: [PATCH 13/36] Fix dark theme primary colour The dark theme was overriding the primary colour with the wrong Ultimaker Blue colour. There is a newer blue, and it was applied as 'accent_1'. The dark theme had its own version of that one too. But the old Primary colour was still the wrong one. Contributes to issue CURA-9465. --- resources/themes/cura-dark/theme.json | 1 - resources/themes/cura-light/theme.json | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/resources/themes/cura-dark/theme.json b/resources/themes/cura-dark/theme.json index 36b7ea831b..7fd5d797cd 100644 --- a/resources/themes/cura-dark/theme.json +++ b/resources/themes/cura-dark/theme.json @@ -48,7 +48,6 @@ "lining": "border_main", "viewport_overlay": "background_1", - "primary": [12, 169, 227, 255], "primary_text": "text_default", "secondary": [95, 95, 95, 255], diff --git a/resources/themes/cura-light/theme.json b/resources/themes/cura-light/theme.json index 83eb13f0cb..e7622bc685 100644 --- a/resources/themes/cura-light/theme.json +++ b/resources/themes/cura-light/theme.json @@ -218,7 +218,7 @@ "lining": [192, 193, 194, 255], "viewport_overlay": [246, 246, 246, 255], - "primary": [25, 110, 240, 255], + "primary": "accent_1", "primary_hover": [48, 182, 231, 255], "primary_text": [255, 255, 255, 255], "text_selection": [156, 195, 255, 127], @@ -269,7 +269,7 @@ "text": [25, 25, 25, 255], "text_disabled": [180, 180, 180, 255], "text_detail": [174, 174, 174, 128], - "text_link": [25, 110, 240, 255], + "text_link": "accent_1", "text_inactive": [174, 174, 174, 255], "text_medium": [128, 128, 128, 255], "text_scene": [102, 102, 102, 255], From 00cfa5dc4cc6b7a5fdbfa5c0682c135b1a1ad6d6 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 11 Jul 2022 17:32:14 +0200 Subject: [PATCH 14/36] Remove fill colours from some icons The icons cannot be recoloured if they already have a colour. Contributes to issue CURA-9465. --- resources/themes/cura-light/icons/default/Download.svg | 4 ++-- resources/themes/cura-light/icons/default/People.svg | 4 ++-- resources/themes/cura-light/icons/high/Certificate.svg | 2 +- resources/themes/cura-light/icons/high/Settings.svg | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/resources/themes/cura-light/icons/default/Download.svg b/resources/themes/cura-light/icons/default/Download.svg index cbe0da2a99..fb94cd78b4 100644 --- a/resources/themes/cura-light/icons/default/Download.svg +++ b/resources/themes/cura-light/icons/default/Download.svg @@ -1,3 +1,3 @@ - - + + diff --git a/resources/themes/cura-light/icons/default/People.svg b/resources/themes/cura-light/icons/default/People.svg index 8632b37f7c..6692cbb427 100644 --- a/resources/themes/cura-light/icons/default/People.svg +++ b/resources/themes/cura-light/icons/default/People.svg @@ -1,3 +1,3 @@ - - + + diff --git a/resources/themes/cura-light/icons/high/Certificate.svg b/resources/themes/cura-light/icons/high/Certificate.svg index b588bddd8b..4d2c5ba0cf 100644 --- a/resources/themes/cura-light/icons/high/Certificate.svg +++ b/resources/themes/cura-light/icons/high/Certificate.svg @@ -1,3 +1,3 @@ - + diff --git a/resources/themes/cura-light/icons/high/Settings.svg b/resources/themes/cura-light/icons/high/Settings.svg index 1cd2ff324e..23774a3beb 100644 --- a/resources/themes/cura-light/icons/high/Settings.svg +++ b/resources/themes/cura-light/icons/high/Settings.svg @@ -1,3 +1,3 @@ - - + + From 0fac778601ba94af96234e9441a78b3c219f7436 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 12 Jul 2022 10:06:39 +0200 Subject: [PATCH 15/36] Fix postprocessing settings being too dark In dark theme you couldn't really read them. CURA-9465 --- plugins/PostProcessingPlugin/PostProcessingPlugin.qml | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/PostProcessingPlugin/PostProcessingPlugin.qml b/plugins/PostProcessingPlugin/PostProcessingPlugin.qml index 46d05511cf..a80f304aaa 100644 --- a/plugins/PostProcessingPlugin/PostProcessingPlugin.qml +++ b/plugins/PostProcessingPlugin/PostProcessingPlugin.qml @@ -286,6 +286,7 @@ UM.Dialog { id: definitionsModel containerId: manager.selectedScriptDefinitionId + onContainerIdChanged: definitionsModel.setAllVisible(true) showAll: true } From 36c4c56abb384a39e13b54d67b2f2a2a824f9910 Mon Sep 17 00:00:00 2001 From: "j.spijker@ultimaker.com" Date: Tue, 12 Jul 2022 10:55:05 +0200 Subject: [PATCH 16/36] Use custom versioning system We already had to customize to much, it isn't worth the effort to continue with GitVersion The script still has some issues when a tag is pushed Contributes to CURA-9365 --- .github/workflows/conan-recipe-version.yml | 171 +++++++++++------- .../workflows/requirements-conan-package.txt | 3 +- 2 files changed, 106 insertions(+), 68 deletions(-) diff --git a/.github/workflows/conan-recipe-version.yml b/.github/workflows/conan-recipe-version.yml index dd30e8807a..a69b1206e0 100644 --- a/.github/workflows/conan-recipe-version.yml +++ b/.github/workflows/conan-recipe-version.yml @@ -10,15 +10,23 @@ on: outputs: recipe_id_full: description: "The full Conan recipe id: /@/" - value: ${{ jobs.get-semver.outputs.recipe_id_full }} + value: ${{ jobs.get-conan-broadcast-data.outputs.recipe_id_full }} recipe_id_latest: description: "The full Conan recipe aliased (latest) id: /(latest)@/" - value: ${{ jobs.get-semver.outputs.recipe_id_latest }} + value: ${{ jobs.get-conan-broadcast-data.outputs.recipe_id_latest }} recipe_semver_full: description: "The full semver ..-+" - value: ${{ jobs.get-semver.outputs.semver_full }} + value: ${{ jobs.get-conan-broadcast-data.outputs.semver_full }} + + recipe_user: + description: "The conan user" + value: ${{ jobs.get-conan-broadcast-data.outputs.user }} + + recipe_channel: + description: "The conan channel" + value: ${{ jobs.get-conan-broadcast-data.outputs.channel }} jobs: get-semver: @@ -26,10 +34,9 @@ jobs: runs-on: ubuntu-latest outputs: - recipe_id_full: ${{ inputs.project_name }}/${{ steps.get-conan-broadcast-data.outputs.version }}@${{ steps.get-conan-broadcast-data.outputs.user }}/${{ steps.get-conan-broadcast-data.outputs.channel }} - recipe_id_latest: ${{ steps.latest-alias.outputs.recipe_id_latest }} - recipe_id_pr: ${{ steps.pr-alias.outputs.recipe_id_pr }} - semver_full: ${{ steps.get-conan-broadcast-data.outputs.version }} + recipe_id_full: ${{ steps.get-conan-broadcast-data.outputs.recipe_id_full }} + recipe_id_latest: ${{ steps.get-conan-broadcast-data.outputs.recipe_id_latest }} + semver_full: ${{ steps.get-conan-broadcast-data.outputs.semver_full }} user: ${{ steps.get-conan-broadcast-data.outputs.user }} channel: ${{ steps.get-conan-broadcast-data.outputs.channel }} @@ -40,69 +47,99 @@ jobs: ref: ${{ github.head_ref }} fetch-depth: 0 - - name: Install GitVersion - uses: gittools/actions/gitversion/setup@v0.9.13 + - name: Setup Python and pip + uses: actions/setup-python@v4 with: - versionSpec: '5.x' + python-version: "3.10.x" + cache: 'pip' + cache-dependency-path: .github/workflows/requirements-conan-package.txt - - name: GitTools - id: git-tool - uses: gittools/actions/gitversion/execute@v0.9.13 + - name: Install Python requirements and Create default Conan profile + run: pip install -r .github/workflows/requirements-conan-package.txt - id: get-conan-broadcast-data name: Get Conan broadcast data run: | - if [ "${{ github.ref_type == 'tag' && github.ref_name == '${{ steps.git-tool.outputs.Major }}.${{ steps.git-tool.outputs.Minor }}.${{ steps.git-tool.outputs.Patch }}' }}" = "true" ]; then - # tagged commits on a release branch matching the major.minor.patch are actual released version and should have no user and channel - # name/major.minor.patch@_/_ - echo '::set-output name=user::_' - echo '::set-output name=channel::_' - echo '::set-output name=version::${{ steps.git-tool.outputs.Major }}.${{ steps.git-tool.outputs.Minor }}.${{ steps.git-tool.outputs.Patch }}' - elif [ "${{ github.ref_type == 'tag' && github.ref_name == '${{ steps.git-tool.outputs.Major }}.${{ steps.git-tool.outputs.Minor }}.${{ steps.git-tool.outputs.Patch }}-BETA' }}" = "true" ]; then - # tagged commits with major.minor.patch-BETA on a release branch are actual released version and should have no user and channel - # name/major.minor.patch-beta@_/_ - echo '::set-output name=user::_' - echo '::set-output name=channel::_' - echo '::set-output name=version::${{ steps.git-tool.outputs.Major }}.${{ steps.git-tool.outputs.Minor }}.${{ steps.git-tool.outputs.Patch }}-${{ steps.git-tool.outputs.PreReleaseLabel }}' - elif [ "${{ github.ref_name == 'main' || github.ref_name == 'master' }}" = "true" ]; then - # commits on main/master are alpha's (nightlies) and are considered testing - # name/major.minor.patch-alpha+build@ultimaker/testing - echo ${{ github.repository_owner }} | awk '{print "::set-output name=user::"tolower($0)}' - echo '::set-output name=channel::testing' - echo '::set-output name=version::${{ steps.git-tool.outputs.Major }}.${{ steps.git-tool.outputs.Minor }}.${{ steps.git-tool.outputs.Patch }}-${{ steps.git-tool.outputs.PreReleaseLabel }}+${{ steps.git-tool.outputs.BuildMetaData }}' - elif [ "${{ github.ref_name == '5.1' }}" = "true" ]; then - # commits on release branches are beta's and are considered stable - # name/major.minor.patch-beta+build@ultimaker/stable - # FIXME: For release branches: maybe rename the branch to release/** - echo ${{ github.repository_owner }} | awk '{print "::set-output name=user::"tolower($0)}' - echo '::set-output name=channel::stable' - echo '::set-output name=version::${{ steps.git-tool.outputs.Major }}.${{ steps.git-tool.outputs.Minor }}.${{ steps.git-tool.outputs.Patch }}-${{ steps.git-tool.outputs.PreReleaseLabel }}+${{ steps.git-tool.outputs.BuildMetaData }}' - else - # commits on other branches are considered unstable and for development purposes only - # Use the Cura branch naming scheme CURA-1234_foo_bar - # we use the first 9 characters of the branch name - # name/major.minor.patch-beta+build@ultimaker/cura_ - echo ${{ github.repository_owner }} | awk '{print "::set-output name=user::"tolower($0)}' - branch=${{ github.ref_name }} - sanitized_branch="${branch//-/_}" - echo $sanitized_branch | awk '{print "::set-output name=channel::"substr(tolower($0),0,9)}' - echo '::set-output version=${{ steps.git-tool.outputs.Major }}.${{ steps.git-tool.outputs.Minor }}.${{ steps.git-tool.outputs.Patch }}-${{ steps.git-tool.outputs.PreReleaseLabel }}+${{ steps.git-tool.outputs.BuildMetaData }}' - fi - - - name: Get pull request alias - id: pr-alias - run: | - if [ "${{ github.event_name == 'pull_request' }}" = "true" ]; then - # pull request events are considered unstable and are for testing purposes - # name/latest@ultimaker/pr_ - echo "::set-output name=recipe_id_pr::${{ inputs.project_name }}/latest@${{ steps.get-conan-broadcast-data.outputs.user }}/pr_$PR_NUMBER" - else - echo "::set-output name=recipe_id_pr::''" - fi - env: - PR_NUMBER: ${{ github.event.issue.number }} - - - name: Get latest alias - id: latest-alias - run: | - echo "::set-output name=recipe_id_latest::${{ inputs.project_name }}/latest@${{ steps.get-conan-broadcast-data.outputs.user }}/${{ steps.get-conan-broadcast-data.outputs.channel }}" + from conans import tools + from conans.errors import ConanException + from git import Repo + + repo = Repo('.') + user = "${{ github.repository_owner }}" + project_name = "test" + event_name = "${{ github.event_name }}" + issue_number = "${{ github.event.issue.number }}" + is_tag = "${{ github.ref_type }}" == "tag" + + # FIXME: for when we push a tag (such as an release) + if is_tag: + branch_version = tools.Version("2.3.5") + else: + try: + branch_version = tools.Version(repo.active_branch.name) + channel = "stable" + except ConanException: + branch_version = tools.Version('0.0.0') + if repo.active_branch.name == f"{branch_version.major}.{branch_version.minor}": + channel = 'stable' + elif repo.active_branch.name == "main" or repo.active_branch.name == "master": + channel = 'testing' + else: + channel = repo.active_branch.name.split("_").replace("-", "_").lower() + + if event_name == "pull_request": + channel = f"pr_{issue_number}" + + # %% Get the actual version + latest_branch_version = tools.Version("0.0.0") + latest_branch_tag = None + for tag in repo.git.tag(merged = True).splitlines(): + try: + version = tools.Version(tag) + except ConanException: + continue + if version > latest_branch_version: + latest_branch_version = version + latest_branch_tag = repo.tag(tag) + + # %% Get the actual version + no_commits = 0 + for commit in repo.iter_commits("HEAD"): + if commit == latest_branch_tag.commit: + break + no_commits += 1 + + if no_commits == 0: + # This is a release + actual_version = f"{latest_branch_version.major}.{latest_branch_version.minor}.{latest_branch_version.patch}" + if channel == "stable": + user = "_" + channel = "_" + else: + if event_name == "pull_request": + actual_version = f"{latest_branch_version.major}.{latest_branch_version.minor}.{latest_branch_version.patch}-{latest_branch_version.prerelease.lower()}+pr_{issue_number}_{no_commits}" + else: + if latest_branch_version.prerelease == "": + actual_version = f"{latest_branch_version.major}.{latest_branch_version.minor}.{latest_branch_version.patch}-alpha+{no_commits}" + else: + actual_version = f"{latest_branch_version.major}.{latest_branch_version.minor}.{latest_branch_version.patch}-{latest_branch_version.prerelease.lower()}+{no_commits}" + + # %% print to output + print(f"::set-output name=name::{project_name}") + print(f"::set-output name=version::{actual_version}") + print(f"::set-output name=user::{user}") + print(f"::set-output name=channel::{channel}") + print(f"::set-output name=recipe_id_full::{project_name}/{actual_version}@{user}/{channel}") + print(f"::set-output name=recipe_id_latest::{project_name}/latest@{user}/{channel}") + print(f"::set-output name=semver_full::{actual_version}") + + print("::group::Conan Recipe Information") + print(f"name = {project_name}") + print(f"version = {actual_version}") + print(f"user = {user}") + print(f"channel = {channel}") + print(f"recipe_id_full = {project_name}/{actual_version}@{user}/{channel}") + print(f"recipe_id_latest = {project_name}/latest@{user}/{channel}") + print(f"semver_full = {actual_version}") + print("::endgroup::") + shell: python diff --git a/.github/workflows/requirements-conan-package.txt b/.github/workflows/requirements-conan-package.txt index 674ef437c2..41fa67dd16 100644 --- a/.github/workflows/requirements-conan-package.txt +++ b/.github/workflows/requirements-conan-package.txt @@ -1,2 +1,3 @@ conan -sip==6.5.1 \ No newline at end of file +sip==6.5.1 +gitpython From ba1e4eb39f4b716b0b24a884c92867f5a11904bd Mon Sep 17 00:00:00 2001 From: "j.spijker@ultimaker.com" Date: Tue, 12 Jul 2022 10:58:07 +0200 Subject: [PATCH 17/36] use the first index Contributes to CURA-9365 --- .github/workflows/conan-recipe-version.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/conan-recipe-version.yml b/.github/workflows/conan-recipe-version.yml index a69b1206e0..4dc7821a5f 100644 --- a/.github/workflows/conan-recipe-version.yml +++ b/.github/workflows/conan-recipe-version.yml @@ -85,7 +85,7 @@ jobs: elif repo.active_branch.name == "main" or repo.active_branch.name == "master": channel = 'testing' else: - channel = repo.active_branch.name.split("_").replace("-", "_").lower() + channel = repo.active_branch.name.split("_")[0].replace("-", "_").lower() if event_name == "pull_request": channel = f"pr_{issue_number}" From fbf49221b56091fd9aaf4e672e48a919472ecceb Mon Sep 17 00:00:00 2001 From: "j.spijker@ultimaker.com" Date: Tue, 12 Jul 2022 11:02:48 +0200 Subject: [PATCH 18/36] Count from the latest stable release Contributes to CURA-9365 --- .github/workflows/conan-recipe-version.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/conan-recipe-version.yml b/.github/workflows/conan-recipe-version.yml index 4dc7821a5f..e0b744d5fa 100644 --- a/.github/workflows/conan-recipe-version.yml +++ b/.github/workflows/conan-recipe-version.yml @@ -98,7 +98,7 @@ jobs: version = tools.Version(tag) except ConanException: continue - if version > latest_branch_version: + if version > latest_branch_version and version.prerelease is "": latest_branch_version = version latest_branch_tag = repo.tag(tag) From 5dd1798979d19a8481833d7924db851854b4c346 Mon Sep 17 00:00:00 2001 From: "j.spijker@ultimaker.com" Date: Tue, 12 Jul 2022 11:03:52 +0200 Subject: [PATCH 19/36] Use the input for the project name Contributes to CURA-9365 --- .github/workflows/conan-recipe-version.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/conan-recipe-version.yml b/.github/workflows/conan-recipe-version.yml index e0b744d5fa..6025da00e9 100644 --- a/.github/workflows/conan-recipe-version.yml +++ b/.github/workflows/conan-recipe-version.yml @@ -66,7 +66,7 @@ jobs: repo = Repo('.') user = "${{ github.repository_owner }}" - project_name = "test" + project_name = "${{ inputs.project_name }}" event_name = "${{ github.event_name }}" issue_number = "${{ github.event.issue.number }}" is_tag = "${{ github.ref_type }}" == "tag" From fcc1a38e3fd022556697e5140db448bd5aa88ffa Mon Sep 17 00:00:00 2001 From: "j.spijker@ultimaker.com" Date: Tue, 12 Jul 2022 11:08:22 +0200 Subject: [PATCH 20/36] Use the latest prerelease but count from the latest stable Contributes to CURA-9365 --- .github/workflows/conan-recipe-version.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/conan-recipe-version.yml b/.github/workflows/conan-recipe-version.yml index 6025da00e9..c185a1d11f 100644 --- a/.github/workflows/conan-recipe-version.yml +++ b/.github/workflows/conan-recipe-version.yml @@ -98,8 +98,9 @@ jobs: version = tools.Version(tag) except ConanException: continue - if version > latest_branch_version and version.prerelease is "": + if version > latest_branch_version: latest_branch_version = version + if version.prerelease_tag is "": latest_branch_tag = repo.tag(tag) # %% Get the actual version From cf9482218fab57bc895d0d4e0992b90ada23cd3e Mon Sep 17 00:00:00 2001 From: "j.spijker@ultimaker.com" Date: Tue, 12 Jul 2022 11:10:55 +0200 Subject: [PATCH 21/36] fix typo Contributes to CURA-9365 --- .github/workflows/conan-recipe-version.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/conan-recipe-version.yml b/.github/workflows/conan-recipe-version.yml index c185a1d11f..1ae32f2d34 100644 --- a/.github/workflows/conan-recipe-version.yml +++ b/.github/workflows/conan-recipe-version.yml @@ -100,7 +100,7 @@ jobs: continue if version > latest_branch_version: latest_branch_version = version - if version.prerelease_tag is "": + if version.prerelease is "": latest_branch_tag = repo.tag(tag) # %% Get the actual version From 2263407856992afe9cdd0f8e15015e58cb7a2db0 Mon Sep 17 00:00:00 2001 From: "j.spijker@ultimaker.com" Date: Tue, 12 Jul 2022 11:16:06 +0200 Subject: [PATCH 22/36] Count from latest tag This can result in a strange versioning compared to the previous 5.1.0 beta, but it will only be cosmetic Contributes to CURA-9365 --- .github/workflows/conan-recipe-version.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/conan-recipe-version.yml b/.github/workflows/conan-recipe-version.yml index 1ae32f2d34..24be3f8a19 100644 --- a/.github/workflows/conan-recipe-version.yml +++ b/.github/workflows/conan-recipe-version.yml @@ -100,7 +100,6 @@ jobs: continue if version > latest_branch_version: latest_branch_version = version - if version.prerelease is "": latest_branch_tag = repo.tag(tag) # %% Get the actual version From b3c60eb34bab0901a10a4acb786576a20a092d62 Mon Sep 17 00:00:00 2001 From: "j.spijker@ultimaker.com" Date: Tue, 12 Jul 2022 11:32:04 +0200 Subject: [PATCH 23/36] Get correct issue number from PR Contributes to CURA-9365 --- .github/workflows/conan-recipe-version.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/conan-recipe-version.yml b/.github/workflows/conan-recipe-version.yml index 24be3f8a19..854d54522c 100644 --- a/.github/workflows/conan-recipe-version.yml +++ b/.github/workflows/conan-recipe-version.yml @@ -68,7 +68,7 @@ jobs: user = "${{ github.repository_owner }}" project_name = "${{ inputs.project_name }}" event_name = "${{ github.event_name }}" - issue_number = "${{ github.event.issue.number }}" + issue_number = "${{ github.ref }}".split('/')[2] is_tag = "${{ github.ref_type }}" == "tag" # FIXME: for when we push a tag (such as an release) From 8ae326d7a514566f31bf73dcefdd2cf9c4227761 Mon Sep 17 00:00:00 2001 From: "j.spijker@ultimaker.com" Date: Tue, 12 Jul 2022 11:45:20 +0200 Subject: [PATCH 24/36] use the job outputs Contributes to CURA-9365 --- .github/workflows/conan-recipe-version.yml | 30 +++++++++++++--------- 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/.github/workflows/conan-recipe-version.yml b/.github/workflows/conan-recipe-version.yml index 854d54522c..d12f31b26f 100644 --- a/.github/workflows/conan-recipe-version.yml +++ b/.github/workflows/conan-recipe-version.yml @@ -10,23 +10,23 @@ on: outputs: recipe_id_full: description: "The full Conan recipe id: /@/" - value: ${{ jobs.get-conan-broadcast-data.outputs.recipe_id_full }} + value: ${{ jobs.get-semver.outputs.recipe_id_full }} recipe_id_latest: description: "The full Conan recipe aliased (latest) id: /(latest)@/" - value: ${{ jobs.get-conan-broadcast-data.outputs.recipe_id_latest }} + value: ${{ jobs.get-semver.outputs.recipe_id_latest }} recipe_semver_full: description: "The full semver ..-+" - value: ${{ jobs.get-conan-broadcast-data.outputs.semver_full }} + value: ${{ jobs.get-semver.outputs.semver_full }} recipe_user: description: "The conan user" - value: ${{ jobs.get-conan-broadcast-data.outputs.user }} + value: ${{ jobs.get-semver.outputs.user }} recipe_channel: description: "The conan channel" - value: ${{ jobs.get-conan-broadcast-data.outputs.channel }} + value: ${{ jobs.get-semver.outputs.channel }} jobs: get-semver: @@ -60,6 +60,7 @@ jobs: - id: get-conan-broadcast-data name: Get Conan broadcast data run: | + import subprocess from conans import tools from conans.errors import ConanException from git import Repo @@ -125,13 +126,18 @@ jobs: actual_version = f"{latest_branch_version.major}.{latest_branch_version.minor}.{latest_branch_version.patch}-{latest_branch_version.prerelease.lower()}+{no_commits}" # %% print to output - print(f"::set-output name=name::{project_name}") - print(f"::set-output name=version::{actual_version}") - print(f"::set-output name=user::{user}") - print(f"::set-output name=channel::{channel}") - print(f"::set-output name=recipe_id_full::{project_name}/{actual_version}@{user}/{channel}") - print(f"::set-output name=recipe_id_latest::{project_name}/latest@{user}/{channel}") - print(f"::set-output name=semver_full::{actual_version}") + cmd_name = ["echo", f"'::set-output name=name::{project_name}'"] + subprocess.call(cmd_name) + cmd_version = ["echo", f"'::set-output name=version::{actual_version}'"] + subprocess.call(cmd_version) + cmd_channel = ["echo", f"'::set-output name=channel::{channel}'"] + subprocess.call(cmd_channel) + cmd_id_full= ["echo", f"'::set-output name=recipe_id_full::{project_name}/{actual_version}@{user}/{channel}'"] + subprocess.call(cmd_id_full) + cmd_id_latest = ["echo", f"'::set-output name=recipe_id_latest::{project_name}/latest@{user}/{channel}'"] + subprocess.call(cmd_id_latest) + cmd_semver_full = ["echo", f"'::set-output name=semver_full::{actual_version}'"] + subprocess.call(cmd_semver_full) print("::group::Conan Recipe Information") print(f"name = {project_name}") From 51da6ca87b7647feb31a928671e01f48c71c887a Mon Sep 17 00:00:00 2001 From: "j.spijker@ultimaker.com" Date: Tue, 12 Jul 2022 11:49:06 +0200 Subject: [PATCH 25/36] remove single quotes Contributes to CURA-9365 --- .github/workflows/conan-recipe-version.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/conan-recipe-version.yml b/.github/workflows/conan-recipe-version.yml index d12f31b26f..137fbd30d9 100644 --- a/.github/workflows/conan-recipe-version.yml +++ b/.github/workflows/conan-recipe-version.yml @@ -126,17 +126,17 @@ jobs: actual_version = f"{latest_branch_version.major}.{latest_branch_version.minor}.{latest_branch_version.patch}-{latest_branch_version.prerelease.lower()}+{no_commits}" # %% print to output - cmd_name = ["echo", f"'::set-output name=name::{project_name}'"] + cmd_name = ["echo", f"::set-output name=name::{project_name}"] subprocess.call(cmd_name) - cmd_version = ["echo", f"'::set-output name=version::{actual_version}'"] + cmd_version = ["echo", f"::set-output name=version::{actual_version}"] subprocess.call(cmd_version) - cmd_channel = ["echo", f"'::set-output name=channel::{channel}'"] + cmd_channel = ["echo", f"::set-output name=channel::{channel}"] subprocess.call(cmd_channel) - cmd_id_full= ["echo", f"'::set-output name=recipe_id_full::{project_name}/{actual_version}@{user}/{channel}'"] + cmd_id_full= ["echo", f"::set-output name=recipe_id_full::{project_name}/{actual_version}@{user}/{channel}"] subprocess.call(cmd_id_full) - cmd_id_latest = ["echo", f"'::set-output name=recipe_id_latest::{project_name}/latest@{user}/{channel}'"] + cmd_id_latest = ["echo", f"::set-output name=recipe_id_latest::{project_name}/latest@{user}/{channel}"] subprocess.call(cmd_id_latest) - cmd_semver_full = ["echo", f"'::set-output name=semver_full::{actual_version}'"] + cmd_semver_full = ["echo", f"::set-output name=semver_full::{actual_version}"] subprocess.call(cmd_semver_full) print("::group::Conan Recipe Information") From b268657fbdedd768676749eeb9fd2a2c21850ec7 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Tue, 12 Jul 2022 12:18:38 +0200 Subject: [PATCH 26/36] Enable Alternate Wall Dirs for end-users too. It's a little bit unclear, but the initial reason we set this to false was because we wanted to make sure most of the 'metal print' releated features dropped in 5.1, not 5.0? still CURA-8097 .. sort of --- resources/definitions/fdmprinter.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index d8f6ad05cd..823b2f0b4f 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -8040,7 +8040,7 @@ "description": "Alternate wall directions every other layer and inset. Useful for materials that can build up stress, like for metal printing.", "type": "bool", "default_value": false, - "enabled": false, + "enabled": true, "settable_per_mesh": true, "settable_per_extruder": true }, From 2a2945bcfe27d8e8c19df3cf2faaa7c897804220 Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Wed, 13 Jul 2022 09:25:16 +0200 Subject: [PATCH 27/36] Attempt to fix tests Remove `gitpython` from requirements-conan-package.txt and install it manually instead --- .github/workflows/conan-recipe-version.yml | 4 +++- .github/workflows/requirements-conan-package.txt | 1 - 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/conan-recipe-version.yml b/.github/workflows/conan-recipe-version.yml index 137fbd30d9..8e4e38553b 100644 --- a/.github/workflows/conan-recipe-version.yml +++ b/.github/workflows/conan-recipe-version.yml @@ -55,7 +55,9 @@ jobs: cache-dependency-path: .github/workflows/requirements-conan-package.txt - name: Install Python requirements and Create default Conan profile - run: pip install -r .github/workflows/requirements-conan-package.txt + run: | + pip install -r .github/workflows/requirements-conan-package.txt + pip install gitpython - id: get-conan-broadcast-data name: Get Conan broadcast data diff --git a/.github/workflows/requirements-conan-package.txt b/.github/workflows/requirements-conan-package.txt index 41fa67dd16..c6b564e450 100644 --- a/.github/workflows/requirements-conan-package.txt +++ b/.github/workflows/requirements-conan-package.txt @@ -1,3 +1,2 @@ conan sip==6.5.1 -gitpython From 32eefbb404c1430e5542938bb8f0c2689407614c Mon Sep 17 00:00:00 2001 From: "p.kuiper" Date: Wed, 13 Jul 2022 16:29:18 +0200 Subject: [PATCH 28/36] Removed the 'support_infill_sparse_thickness' setting from the global quality files and only added them to the PVA and BAM quality files. This prevents infill layer skipping during self support. Relates to PP-193 --- resources/quality/ultimaker3/um3_aa0.4_BAM_Fast_Print.inst.cfg | 1 + .../quality/ultimaker3/um3_aa0.4_BAM_Normal_Quality.inst.cfg | 1 + resources/quality/ultimaker3/um3_bb0.4_PVA_Fast_Print.inst.cfg | 1 + .../quality/ultimaker3/um3_bb0.4_PVA_High_Quality.inst.cfg | 1 + .../quality/ultimaker3/um3_bb0.4_PVA_Normal_Quality.inst.cfg | 1 + .../quality/ultimaker3/um3_bb0.8_PVA_Superdraft_Print.inst.cfg | 1 - .../quality/ultimaker3/um3_bb0.8_PVA_Verydraft_Print.inst.cfg | 2 -- resources/quality/ultimaker3/um3_global_Fast_Quality.inst.cfg | 3 +-- resources/quality/ultimaker3/um3_global_High_Quality.inst.cfg | 3 +-- .../quality/ultimaker3/um3_global_Normal_Quality.inst.cfg | 1 - .../quality/ultimaker_s3/um_s3_aa0.4_BAM_Fast_Print.inst.cfg | 1 + .../ultimaker_s3/um_s3_aa0.4_BAM_Normal_Quality.inst.cfg | 1 + .../quality/ultimaker_s3/um_s3_bb0.4_PVA_Fast_Print.inst.cfg | 1 + .../quality/ultimaker_s3/um_s3_bb0.4_PVA_High_Quality.inst.cfg | 1 + .../ultimaker_s3/um_s3_bb0.4_PVA_Normal_Quality.inst.cfg | 1 + .../quality/ultimaker_s3/um_s3_global_Fast_Quality.inst.cfg | 1 - .../quality/ultimaker_s3/um_s3_global_High_Quality.inst.cfg | 1 - .../quality/ultimaker_s3/um_s3_global_Normal_Quality.inst.cfg | 1 - .../quality/ultimaker_s5/um_s5_aa0.4_BAM_Fast_Print.inst.cfg | 1 + .../ultimaker_s5/um_s5_aa0.4_BAM_Normal_Quality.inst.cfg | 1 + .../quality/ultimaker_s5/um_s5_bb0.4_PVA_Fast_Print.inst.cfg | 1 + .../quality/ultimaker_s5/um_s5_bb0.4_PVA_High_Quality.inst.cfg | 1 + .../ultimaker_s5/um_s5_bb0.4_PVA_Normal_Quality.inst.cfg | 1 + .../quality/ultimaker_s5/um_s5_global_Fast_Quality.inst.cfg | 1 - .../quality/ultimaker_s5/um_s5_global_High_Quality.inst.cfg | 1 - .../quality/ultimaker_s5/um_s5_global_Normal_Quality.inst.cfg | 1 - 26 files changed, 17 insertions(+), 14 deletions(-) diff --git a/resources/quality/ultimaker3/um3_aa0.4_BAM_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_BAM_Fast_Print.inst.cfg index 64a6db0573..fd8f22a3fe 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_BAM_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_BAM_Fast_Print.inst.cfg @@ -12,6 +12,7 @@ material = generic_bam variant = AA 0.4 [values] +support_infill_sparse_thickness = =2*layer_height brim_replaces_support = False cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =cool_fan_speed diff --git a/resources/quality/ultimaker3/um3_aa0.4_BAM_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_aa0.4_BAM_Normal_Quality.inst.cfg index 5c2f5635fc..0723122770 100644 --- a/resources/quality/ultimaker3/um3_aa0.4_BAM_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_aa0.4_BAM_Normal_Quality.inst.cfg @@ -12,6 +12,7 @@ material = generic_bam variant = AA 0.4 [values] +support_infill_sparse_thickness = =2*layer_height brim_replaces_support = False cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =cool_fan_speed diff --git a/resources/quality/ultimaker3/um3_bb0.4_PVA_Fast_Print.inst.cfg b/resources/quality/ultimaker3/um3_bb0.4_PVA_Fast_Print.inst.cfg index bc3928bab4..7ad6967e6b 100644 --- a/resources/quality/ultimaker3/um3_bb0.4_PVA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_bb0.4_PVA_Fast_Print.inst.cfg @@ -12,6 +12,7 @@ material = generic_pva variant = BB 0.4 [values] +support_infill_sparse_thickness = =2*layer_height brim_replaces_support = False material_print_temperature = =default_material_print_temperature + 5 material_standby_temperature = 100 diff --git a/resources/quality/ultimaker3/um3_bb0.4_PVA_High_Quality.inst.cfg b/resources/quality/ultimaker3/um3_bb0.4_PVA_High_Quality.inst.cfg index 9dd15079c7..add681b5c6 100644 --- a/resources/quality/ultimaker3/um3_bb0.4_PVA_High_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_bb0.4_PVA_High_Quality.inst.cfg @@ -12,6 +12,7 @@ material = generic_pva variant = BB 0.4 [values] +support_infill_sparse_thickness = =3*layer_height brim_replaces_support = False material_standby_temperature = 100 prime_tower_enable = False diff --git a/resources/quality/ultimaker3/um3_bb0.4_PVA_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_bb0.4_PVA_Normal_Quality.inst.cfg index 7e22a08939..fbf7d65477 100644 --- a/resources/quality/ultimaker3/um3_bb0.4_PVA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_bb0.4_PVA_Normal_Quality.inst.cfg @@ -12,6 +12,7 @@ material = generic_pva variant = BB 0.4 [values] +support_infill_sparse_thickness = =2*layer_height brim_replaces_support = False material_standby_temperature = 100 prime_tower_enable = False diff --git a/resources/quality/ultimaker3/um3_bb0.8_PVA_Superdraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_bb0.8_PVA_Superdraft_Print.inst.cfg index e298848a90..07b91499e4 100644 --- a/resources/quality/ultimaker3/um3_bb0.8_PVA_Superdraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_bb0.8_PVA_Superdraft_Print.inst.cfg @@ -13,7 +13,6 @@ variant = BB 0.8 [values] brim_replaces_support = False -layer_height = 0.4 material_standby_temperature = 100 retraction_count_max = 5 support_brim_enable = True diff --git a/resources/quality/ultimaker3/um3_bb0.8_PVA_Verydraft_Print.inst.cfg b/resources/quality/ultimaker3/um3_bb0.8_PVA_Verydraft_Print.inst.cfg index f52206e9b3..6177272235 100644 --- a/resources/quality/ultimaker3/um3_bb0.8_PVA_Verydraft_Print.inst.cfg +++ b/resources/quality/ultimaker3/um3_bb0.8_PVA_Verydraft_Print.inst.cfg @@ -13,11 +13,9 @@ variant = BB 0.8 [values] brim_replaces_support = False -layer_height = 0.3 material_standby_temperature = 100 retraction_count_max = 5 support_brim_enable = True -support_infill_sparse_thickness = 0.3 support_interface_enable = True skirt_brim_minimal_length = =min(2000, 175/(layer_height*line_width)) cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) diff --git a/resources/quality/ultimaker3/um3_global_Fast_Quality.inst.cfg b/resources/quality/ultimaker3/um3_global_Fast_Quality.inst.cfg index fd9ec86036..048708b0d1 100644 --- a/resources/quality/ultimaker3/um3_global_Fast_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_global_Fast_Quality.inst.cfg @@ -11,5 +11,4 @@ weight = -1 global_quality = True [values] -layer_height = 0.15 -support_infill_sparse_thickness = =2*layer_height +layer_height = 0.15 \ No newline at end of file diff --git a/resources/quality/ultimaker3/um3_global_High_Quality.inst.cfg b/resources/quality/ultimaker3/um3_global_High_Quality.inst.cfg index 3522f0b5a0..a67d97a78e 100644 --- a/resources/quality/ultimaker3/um3_global_High_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_global_High_Quality.inst.cfg @@ -11,5 +11,4 @@ weight = 1 global_quality = True [values] -layer_height = 0.06 -support_infill_sparse_thickness = =3*layer_height +layer_height = 0.06 \ No newline at end of file diff --git a/resources/quality/ultimaker3/um3_global_Normal_Quality.inst.cfg b/resources/quality/ultimaker3/um3_global_Normal_Quality.inst.cfg index 5955a587f4..4a68719014 100644 --- a/resources/quality/ultimaker3/um3_global_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker3/um3_global_Normal_Quality.inst.cfg @@ -12,4 +12,3 @@ global_quality = True [values] layer_height = 0.1 -support_infill_sparse_thickness = =2*layer_height diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Fast_Print.inst.cfg index 87415ecb05..577362391f 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Fast_Print.inst.cfg @@ -12,6 +12,7 @@ material = generic_bam variant = AA 0.4 [values] +support_infill_sparse_thickness = =2*layer_height brim_replaces_support = False cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =cool_fan_speed diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Normal_Quality.inst.cfg index 97b9e33f60..416a175c81 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Normal_Quality.inst.cfg @@ -12,6 +12,7 @@ material = generic_bam variant = AA 0.4 [values] +support_infill_sparse_thickness = =2*layer_height brim_replaces_support = False cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =cool_fan_speed diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Fast_Print.inst.cfg index 85e3e2530a..1df9f6b97b 100644 --- a/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Fast_Print.inst.cfg @@ -12,6 +12,7 @@ material = generic_pva variant = BB 0.4 [values] +support_infill_sparse_thickness = =2*layer_height brim_replaces_support = False material_print_temperature = =default_material_print_temperature + 5 material_standby_temperature = 100 diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_High_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_High_Quality.inst.cfg index 5bcaf96f5f..7495130aa9 100644 --- a/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_High_Quality.inst.cfg @@ -12,6 +12,7 @@ material = generic_pva variant = BB 0.4 [values] +support_infill_sparse_thickness = =3*layer_height brim_replaces_support = False material_standby_temperature = 100 prime_tower_enable = False diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Normal_Quality.inst.cfg index 7b31e48283..308d26bf62 100644 --- a/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Normal_Quality.inst.cfg @@ -12,6 +12,7 @@ material = generic_pva variant = BB 0.4 [values] +support_infill_sparse_thickness = =2*layer_height brim_replaces_support = False material_standby_temperature = 100 prime_tower_enable = False diff --git a/resources/quality/ultimaker_s3/um_s3_global_Fast_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_global_Fast_Quality.inst.cfg index 3742eec814..5d2618a02d 100644 --- a/resources/quality/ultimaker_s3/um_s3_global_Fast_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_global_Fast_Quality.inst.cfg @@ -12,4 +12,3 @@ global_quality = True [values] layer_height = 0.15 -support_infill_sparse_thickness = =2*layer_height diff --git a/resources/quality/ultimaker_s3/um_s3_global_High_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_global_High_Quality.inst.cfg index 4c7dbe5b28..88d6049ff9 100644 --- a/resources/quality/ultimaker_s3/um_s3_global_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_global_High_Quality.inst.cfg @@ -12,4 +12,3 @@ global_quality = True [values] layer_height = 0.06 -support_infill_sparse_thickness = =3*layer_height diff --git a/resources/quality/ultimaker_s3/um_s3_global_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s3/um_s3_global_Normal_Quality.inst.cfg index ff65fd5c57..eccccc6d42 100644 --- a/resources/quality/ultimaker_s3/um_s3_global_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_global_Normal_Quality.inst.cfg @@ -12,4 +12,3 @@ global_quality = True [values] layer_height = 0.1 -support_infill_sparse_thickness = =2*layer_height diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Fast_Print.inst.cfg index e57c078d70..e2450cd6b0 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Fast_Print.inst.cfg @@ -12,6 +12,7 @@ material = generic_bam variant = AA 0.4 [values] +support_infill_sparse_thickness = =2*layer_height brim_replaces_support = False cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =cool_fan_speed diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Normal_Quality.inst.cfg index def9d111c1..24f007b99b 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Normal_Quality.inst.cfg @@ -12,6 +12,7 @@ material = generic_bam variant = AA 0.4 [values] +support_infill_sparse_thickness = =2*layer_height brim_replaces_support = False cool_fan_full_at_height = =layer_height_0 + 2 * layer_height cool_fan_speed_max = =cool_fan_speed diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Fast_Print.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Fast_Print.inst.cfg index f69ecfbb94..b98235718b 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Fast_Print.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Fast_Print.inst.cfg @@ -12,6 +12,7 @@ material = generic_pva variant = BB 0.4 [values] +support_infill_sparse_thickness = =2*layer_height brim_replaces_support = False material_print_temperature = =default_material_print_temperature + 5 material_standby_temperature = 100 diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_High_Quality.inst.cfg index 17b3dd2467..40dcd5da35 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_High_Quality.inst.cfg @@ -12,6 +12,7 @@ material = generic_pva variant = BB 0.4 [values] +support_infill_sparse_thickness = =3*layer_height brim_replaces_support = False material_standby_temperature = 100 prime_tower_enable = False diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Normal_Quality.inst.cfg index 47dcbe57fa..d5397c44eb 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Normal_Quality.inst.cfg @@ -12,6 +12,7 @@ material = generic_pva variant = BB 0.4 [values] +support_infill_sparse_thickness = =2*layer_height brim_replaces_support = False material_standby_temperature = 100 prime_tower_enable = False diff --git a/resources/quality/ultimaker_s5/um_s5_global_Fast_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_global_Fast_Quality.inst.cfg index 34d2946524..8ab6de530f 100644 --- a/resources/quality/ultimaker_s5/um_s5_global_Fast_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_global_Fast_Quality.inst.cfg @@ -12,4 +12,3 @@ global_quality = True [values] layer_height = 0.15 -support_infill_sparse_thickness = =2*layer_height diff --git a/resources/quality/ultimaker_s5/um_s5_global_High_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_global_High_Quality.inst.cfg index 14b0a3bb4e..a3153e8718 100644 --- a/resources/quality/ultimaker_s5/um_s5_global_High_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_global_High_Quality.inst.cfg @@ -12,4 +12,3 @@ global_quality = True [values] layer_height = 0.06 -support_infill_sparse_thickness = =3*layer_height diff --git a/resources/quality/ultimaker_s5/um_s5_global_Normal_Quality.inst.cfg b/resources/quality/ultimaker_s5/um_s5_global_Normal_Quality.inst.cfg index ed099f85bd..ef68e808dc 100644 --- a/resources/quality/ultimaker_s5/um_s5_global_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_global_Normal_Quality.inst.cfg @@ -12,4 +12,3 @@ global_quality = True [values] layer_height = 0.1 -support_infill_sparse_thickness = =2*layer_height From 107d12856d64eb95ace3d09b6b2114744d38ea0d Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 13 Jul 2022 13:13:21 +0200 Subject: [PATCH 29/36] Remove fill colours from this icon Otherwise the theme won't have any effect on it since 5.0. Done as a 5 minute fix. --- plugins/ModelChecker/model_checker.svg | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/plugins/ModelChecker/model_checker.svg b/plugins/ModelChecker/model_checker.svg index ce9594302e..e63e082e27 100644 --- a/plugins/ModelChecker/model_checker.svg +++ b/plugins/ModelChecker/model_checker.svg @@ -1,7 +1,7 @@ - - - - + + + + From 771856fd607bc6c1e6e4763fbdbdb8bcea7b2844 Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Wed, 13 Jul 2022 18:56:24 +0200 Subject: [PATCH 30/36] Use workflow from main --- .github/workflows/unit-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index df260ed8c2..4da369dc6a 100644 --- a/.github/workflows/unit-test.yml +++ b/.github/workflows/unit-test.yml @@ -62,7 +62,7 @@ env: jobs: conan-recipe-version: - uses: ultimaker/cura/.github/workflows/conan-recipe-version.yml@CURA-9365 + uses: ultimaker/cura/.github/workflows/conan-recipe-version.yml@main with: project_name: cura From 8492b2f11facc804413c059035e088f1a514662f Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Wed, 13 Jul 2022 18:57:46 +0200 Subject: [PATCH 31/36] Use workflow from main --- .github/workflows/conan-package.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/conan-package.yml b/.github/workflows/conan-package.yml index fdf83eb3b1..d9d2eaf4ef 100644 --- a/.github/workflows/conan-package.yml +++ b/.github/workflows/conan-package.yml @@ -48,13 +48,13 @@ on: jobs: conan-recipe-version: - uses: ultimaker/cura/.github/workflows/conan-recipe-version.yml@CURA-9365 + uses: ultimaker/cura/.github/workflows/conan-recipe-version.yml@main with: project_name: cura conan-package-export-macos: needs: [ conan-recipe-version ] - uses: ultimaker/cura/.github/workflows/conan-recipe-export.yml@5.1 + uses: ultimaker/cura/.github/workflows/conan-recipe-export.yml@main with: recipe_id_full: ${{ needs.conan-recipe-version.outputs.recipe_id_full }} recipe_id_latest: ${{ needs.conan-recipe-version.outputs.recipe_id_latest }} @@ -68,7 +68,7 @@ jobs: conan-package-export-linux: needs: [ conan-recipe-version ] - uses: ultimaker/cura/.github/workflows/conan-recipe-export.yml@5.1 + uses: ultimaker/cura/.github/workflows/conan-recipe-export.yml@main with: recipe_id_full: ${{ needs.conan-recipe-version.outputs.recipe_id_full }} recipe_id_latest: ${{ needs.conan-recipe-version.outputs.recipe_id_latest }} @@ -82,7 +82,7 @@ jobs: conan-package-export-windows: needs: [ conan-recipe-version ] - uses: ultimaker/cura/.github/workflows/conan-recipe-export.yml@5.1 + uses: ultimaker/cura/.github/workflows/conan-recipe-export.yml@main with: recipe_id_full: ${{ needs.conan-recipe-version.outputs.recipe_id_full }} recipe_id_latest: ${{ needs.conan-recipe-version.outputs.recipe_id_latest }} @@ -98,7 +98,7 @@ jobs: if: ${{ always() }} needs: [ conan-package-export-linux, conan-package-export-macos, conan-package-export-windows ] - uses: ultimaker/cura/.github/workflows/notify.yml@5.1 + uses: ultimaker/cura/.github/workflows/notify.yml@main with: success: ${{ contains(join(needs.*.result, ','), 'success') }} success_title: "New Conan recipe exported in ${{ github.repository }}" From 7dc378fb4c0f108e900fdd6e5ef7d6618c453d75 Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Wed, 13 Jul 2022 19:31:01 +0200 Subject: [PATCH 32/36] remove reference to curaengine copy-paste left over --- .github/workflows/unit-test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml index 4da369dc6a..b52f1a5f02 100644 --- a/.github/workflows/unit-test.yml +++ b/.github/workflows/unit-test.yml @@ -71,7 +71,7 @@ jobs: needs: [ conan-recipe-version ] steps: - - name: Checkout CuraEngine + - name: Checkout uses: actions/checkout@v3 - name: Setup Python and pip From b3cc3818b5b9b67a1d58a0495e096e415d8ac7ae Mon Sep 17 00:00:00 2001 From: "j.spijker@ultimaker.com" Date: Thu, 14 Jul 2022 09:18:37 +0200 Subject: [PATCH 33/36] various fixes to workflow Contributes to CURA-9365 --- .github/workflows/conan-package.yml | 8 ++++---- .github/workflows/conan-recipe-version.yml | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/conan-package.yml b/.github/workflows/conan-package.yml index d9d2eaf4ef..a96afaedab 100644 --- a/.github/workflows/conan-package.yml +++ b/.github/workflows/conan-package.yml @@ -60,7 +60,7 @@ jobs: recipe_id_latest: ${{ needs.conan-recipe-version.outputs.recipe_id_latest }} recipe_id_pr: ${{ needs.conan-recipe-version.outputs.recipe_id_pr }} runs_on: 'macos-10.15' - python_version: '3.10.4' + python_version: '3.10.x' conan_config_branch: 'master' conan_logging_level: 'info' conan_export_binaries: true @@ -74,7 +74,7 @@ jobs: recipe_id_latest: ${{ needs.conan-recipe-version.outputs.recipe_id_latest }} recipe_id_pr: ${{ needs.conan-recipe-version.outputs.recipe_id_pr }} runs_on: 'ubuntu-20.04' - python_version: '3.10.4' + python_version: '3.10.x' conan_config_branch: 'master' conan_logging_level: 'info' conan_export_binaries: true @@ -88,7 +88,7 @@ jobs: recipe_id_latest: ${{ needs.conan-recipe-version.outputs.recipe_id_latest }} recipe_id_pr: ${{ needs.conan-recipe-version.outputs.recipe_id_pr }} runs_on: 'windows-2022' - python_version: '3.10.4' + python_version: '3.10.x' conan_config_branch: 'master' conan_logging_level: 'info' conan_export_binaries: true @@ -96,7 +96,7 @@ jobs: notify-export: if: ${{ always() }} - needs: [ conan-package-export-linux, conan-package-export-macos, conan-package-export-windows ] + needs: [ conan-recipe-version, conan-package-export-linux, conan-package-export-macos, conan-package-export-windows ] uses: ultimaker/cura/.github/workflows/notify.yml@main with: diff --git a/.github/workflows/conan-recipe-version.yml b/.github/workflows/conan-recipe-version.yml index 8e4e38553b..70f28b0290 100644 --- a/.github/workflows/conan-recipe-version.yml +++ b/.github/workflows/conan-recipe-version.yml @@ -76,7 +76,7 @@ jobs: # FIXME: for when we push a tag (such as an release) if is_tag: - branch_version = tools.Version("2.3.5") + branch_version = tools.Version("${{ github.ref_name }}") else: try: branch_version = tools.Version(repo.active_branch.name) From 7f1e17b8203f3084cd65180c7315ac8bfc3b2d8a Mon Sep 17 00:00:00 2001 From: "j.spijker@ultimaker.com" Date: Thu, 14 Jul 2022 09:24:32 +0200 Subject: [PATCH 34/36] Add option for additional conan install args Contributes to CURA-9365 (cherry picked from commit 0d4a8796328769a57746248cc8449eb56882d4c6) --- .github/workflows/cura-installer.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/workflows/cura-installer.yml b/.github/workflows/cura-installer.yml index 8247fc2d47..a4adf07945 100644 --- a/.github/workflows/cura-installer.yml +++ b/.github/workflows/cura-installer.yml @@ -8,6 +8,10 @@ on: # Fixme: default to cura/latest@testing (which is main) default: 'cura/latest@ultimaker/stable' required: true + conan_args: + description: 'Conan args: eq.: --require-override=curaengine/5.1.0-beta+123@ultimaker/testing' + default: '' + required: false conan_config: description: 'Conan config branch to use' default: '' @@ -143,7 +147,7 @@ jobs: run: conan config install https://github.com/Ultimaker/conan-config.git - name: Create the Packages - run: conan install ${{ inputs.cura_conan_version }} --build=missing --update -if cura_inst -g VirtualPythonEnv -o cura:enterprise=${{ inputs.enterprise }} -o cura:staging=${{ inputs.staging }} --json "cura_inst/conan_install_info.json" + run: conan install ${{ inputs.cura_conan_version }} ${{ inputs.conan_args }} --build=missing --update -if cura_inst -g VirtualPythonEnv -o cura:enterprise=${{ inputs.enterprise }} -o cura:staging=${{ inputs.staging }} --json "cura_inst/conan_install_info.json" - name: Set Environment variables for Cura (bash) if: ${{ runner.os != 'Windows' }} From 77979c384de30680c0d0d6db7e6a4dbb4e10eaf2 Mon Sep 17 00:00:00 2001 From: "j.spijker@ultimaker.com" Date: Thu, 14 Jul 2022 14:55:54 +0200 Subject: [PATCH 35/36] Lowercase username Contributes to CURA-9365 (cherry picked from commit f5a559179bac2e638e62c6a41adf22dcb3ec3bdf) --- .github/workflows/conan-recipe-version.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/conan-recipe-version.yml b/.github/workflows/conan-recipe-version.yml index 70f28b0290..ea1915c5cb 100644 --- a/.github/workflows/conan-recipe-version.yml +++ b/.github/workflows/conan-recipe-version.yml @@ -68,7 +68,7 @@ jobs: from git import Repo repo = Repo('.') - user = "${{ github.repository_owner }}" + user = "${{ github.repository_owner }}".lower() project_name = "${{ inputs.project_name }}" event_name = "${{ github.event_name }}" issue_number = "${{ github.ref }}".split('/')[2] From e0c7259149fce773c85e0e8b5ef3f67c8f523c87 Mon Sep 17 00:00:00 2001 From: "j.spijker@ultimaker.com" Date: Thu, 14 Jul 2022 16:28:08 +0200 Subject: [PATCH 36/36] Notify on success Contributes to CURA-9365 --- .github/workflows/cura-installer.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.github/workflows/cura-installer.yml b/.github/workflows/cura-installer.yml index a4adf07945..11fe0ace35 100644 --- a/.github/workflows/cura-installer.yml +++ b/.github/workflows/cura-installer.yml @@ -210,3 +210,16 @@ jobs: dist/*.AppImage dist/*.asc retention-days: 2 + + notify-export: + if: ${{ always() }} + needs: [ cura-installer-create ] + + uses: ultimaker/cura/.github/workflows/notify.yml@main + with: + success: ${{ contains(join(needs.*.result, ','), 'success') }} + success_title: "Create the Cura distributions" + success_body: "Installers for ${{ inputs.cura_conan_version }}" + failure_title: "Failed to create the Cura distributions" + failure_body: "Failed to create at least 1 installer for ${{ inputs.cura_conan_version }}" + secrets: inherit