From d71252dee8a0eeac821b8f4e700704bf077e5f74 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Wed, 18 Oct 2023 14:26:43 +0200 Subject: [PATCH 1/4] Fix description now that we have fractional layer-heights (for top). part of CURA-10407 --- resources/definitions/fdmprinter.def.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 863cd07183..35f75c3786 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -5130,7 +5130,7 @@ "support_z_distance": { "label": "Support Z Distance", - "description": "Distance from the top/bottom of the support structure to the print. This gap provides clearance to remove the supports after the model is printed. This value is rounded up to a multiple of the layer height.", + "description": "Distance from the top/bottom of the support structure to the print. This gap provides clearance to remove the supports after the model is printed. Apart from the top-layer, this value is rounded up to a multiple of the layer height.", "unit": "mm", "type": "float", "minimum_value": "0", @@ -5144,7 +5144,7 @@ "support_top_distance": { "label": "Support Top Distance", - "description": "Distance from the top of the support to the print.", + "description": "Distance from the top of the support to the print. Note that this is not rounded.", "unit": "mm", "minimum_value": "0", "maximum_value_warning": "machine_nozzle_size", @@ -5158,7 +5158,7 @@ "support_bottom_distance": { "label": "Support Bottom Distance", - "description": "Distance from the print to the bottom of the support.", + "description": "Distance from the print to the bottom of the support. Not that this is rounded up to the next layer height.", "unit": "mm", "minimum_value": "0", "maximum_value_warning": "machine_nozzle_size", From 51ace512185656effecf76a1e1ed6b29e41b2008 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Thu, 26 Oct 2023 15:57:05 +0200 Subject: [PATCH 2/4] Fractional layer-heights description refinement CURA-10407 --- resources/definitions/fdmprinter.def.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 308587ad70..3b7dc014f2 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -5130,7 +5130,7 @@ "support_z_distance": { "label": "Support Z Distance", - "description": "Distance from the top/bottom of the support structure to the print. This gap provides clearance to remove the supports after the model is printed. Apart from the top-layer, this value is rounded up to a multiple of the layer height.", + "description": "Distance from the top/bottom of the support structure to the print. This gap provides clearance to remove the supports after the model is printed. The topmost support layer below the model might be a fraction of regular layers.", "unit": "mm", "type": "float", "minimum_value": "0", @@ -5144,7 +5144,7 @@ "support_top_distance": { "label": "Support Top Distance", - "description": "Distance from the top of the support to the print. Note that this is not rounded.", + "description": "Distance from the top of the support to the print.", "unit": "mm", "minimum_value": "0", "maximum_value_warning": "machine_nozzle_size", @@ -5158,7 +5158,7 @@ "support_bottom_distance": { "label": "Support Bottom Distance", - "description": "Distance from the print to the bottom of the support. Not that this is rounded up to the next layer height.", + "description": "Distance from the print to the bottom of the support. Note that this is rounded up to the next layer height.", "unit": "mm", "minimum_value": "0", "maximum_value_warning": "machine_nozzle_size", From edb38aa5f37170949b645b425fa8515252b4aded Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Sat, 28 Oct 2023 08:13:55 +0200 Subject: [PATCH 3/4] Use internal user cura_private_data Easier to filter upon Contributes to CURA-10561 --- conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conanfile.py b/conanfile.py index b2d5b3ab18..5c331ff6ca 100644 --- a/conanfile.py +++ b/conanfile.py @@ -316,7 +316,7 @@ class CuraConan(ConanFile): self.requires("cura_binary_data/(latest)@ultimaker/testing") self.requires("cpython/3.10.4") if self.options.internal: - self.requires("cura_private_data/(latest)@ultimaker/testing") + self.requires("cura_private_data/(latest)@internal/testing") self.requires("fdm_materials/(latest)@internal/testing") else: self.requires("fdm_materials/(latest)@ultimaker/testing") From d8b35aa09f799a509ea8087f84c17641296873c9 Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Sat, 28 Oct 2023 08:21:19 +0200 Subject: [PATCH 4/4] remove private packages before uploading Contributes to CURA-10561 --- .github/workflows/linux.yml | 13 +++++-------- .github/workflows/macos.yml | 6 +++++- .github/workflows/windows.yml | 5 +++++ 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index 719a07250c..cdbb66a5b4 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -106,16 +106,8 @@ jobs: $HOME/.conan/conan_download_cache key: conan-${{ runner.os }}-${{ runner.arch }}-installer-cache - - name: Hack needed specifically for ubuntu-22.04 from mid-Feb 2023 onwards - if: ${{ startsWith(inputs.operating_system, 'ubuntu-22.04') }} - run: sudo apt remove libodbc2 libodbcinst2 unixodbc-common -y - - # NOTE: Due to what are probably github issues, we have to remove the cache and reconfigure before the rest. - # This is maybe because grub caches the disk it uses last time, which is recreated each time. - name: Install Linux system requirements run: | - sudo rm /var/cache/debconf/config.dat - sudo dpkg --configure -a sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y sudo apt update sudo apt upgrade @@ -157,6 +149,11 @@ jobs: - name: Create the Packages (Bash) run: conan install $CURA_CONAN_VERSION ${{ inputs.conan_args }} --build=missing --update -if cura_inst -g VirtualPythonEnv -o cura:enterprise=$ENTERPRISE -o cura:staging=$STAGING --json "cura_inst/conan_install_info.json" + - name: Remove internal packages before uploading + run: | + conan remove "*@internal/*" -f || true + conan remove "cura_private_data*" -f || true + - name: Upload the Package(s) if: always() run: | diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 78b4c23fef..028822d778 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -158,8 +158,12 @@ jobs: - name: Create the Packages (Bash) run: conan install $CURA_CONAN_VERSION ${{ inputs.conan_args }} --build=missing --update -if cura_inst -g VirtualPythonEnv -o cura:enterprise=$ENTERPRISE -o cura:staging=$STAGING --json "cura_inst/conan_install_info.json" + - name: Remove internal packages before uploading + run: | + conan remove "*@internal/*" -f || true + conan remove "cura_private_data*" -f || true + - name: Upload the Package(s) - if: ${{ inputs.operating_system != 'self-hosted' }} run: | conan upload "*" -r cura --all -c diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml index 9c9775cae7..40d9df92c3 100644 --- a/.github/workflows/windows.yml +++ b/.github/workflows/windows.yml @@ -124,6 +124,11 @@ jobs: - name: Create the Packages (Powershell) run: conan install $Env:CURA_CONAN_VERSION ${{ inputs.conan_args }} --build=missing --update -if cura_inst -g VirtualPythonEnv -o cura:enterprise=$Env:ENTERPRISE -o cura:staging=$Env:STAGING --json "cura_inst/conan_install_info.json" + - name: Remove internal packages before uploading + run: | + conan remove "*@internal/*" -f || true + conan remove "cura_private_data*" -f || true + - name: Upload the Package(s) if: always() run: |