From 5e40f2eaec25eaaa0f8f28979fa592e1fa2cf03c Mon Sep 17 00:00:00 2001 From: "j.spijker@ultimaker.com" Date: Mon, 11 Jul 2022 10:09:18 +0200 Subject: 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 -- cgit v1.2.3 From 4c6ad9f4d6d83a25260b62d40fb52b7ba0e37a4e Mon Sep 17 00:00:00 2001 From: "j.spijker@ultimaker.com" Date: Mon, 11 Jul 2022 11:11:17 +0200 Subject: 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 -- cgit v1.2.3 From 479679b01821a14f4e4a86d2836eefa8413b18af Mon Sep 17 00:00:00 2001 From: "j.spijker@ultimaker.com" Date: Mon, 11 Jul 2022 12:04:15 +0200 Subject: 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 -- cgit v1.2.3 From 36c4c56abb384a39e13b54d67b2f2a2a824f9910 Mon Sep 17 00:00:00 2001 From: "j.spijker@ultimaker.com" Date: Tue, 12 Jul 2022 10:55:05 +0200 Subject: 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 ++++++++++++++--------- .github/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 -- cgit v1.2.3 From ba1e4eb39f4b716b0b24a884c92867f5a11904bd Mon Sep 17 00:00:00 2001 From: "j.spijker@ultimaker.com" Date: Tue, 12 Jul 2022 10:58:07 +0200 Subject: 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}" -- cgit v1.2.3 From fbf49221b56091fd9aaf4e672e48a919472ecceb Mon Sep 17 00:00:00 2001 From: "j.spijker@ultimaker.com" Date: Tue, 12 Jul 2022 11:02:48 +0200 Subject: 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) -- cgit v1.2.3 From 5dd1798979d19a8481833d7924db851854b4c346 Mon Sep 17 00:00:00 2001 From: "j.spijker@ultimaker.com" Date: Tue, 12 Jul 2022 11:03:52 +0200 Subject: 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" -- cgit v1.2.3 From fcc1a38e3fd022556697e5140db448bd5aa88ffa Mon Sep 17 00:00:00 2001 From: "j.spijker@ultimaker.com" Date: Tue, 12 Jul 2022 11:08:22 +0200 Subject: 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 -- cgit v1.2.3 From cf9482218fab57bc895d0d4e0992b90ada23cd3e Mon Sep 17 00:00:00 2001 From: "j.spijker@ultimaker.com" Date: Tue, 12 Jul 2022 11:10:55 +0200 Subject: 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 -- cgit v1.2.3 From 2263407856992afe9cdd0f8e15015e58cb7a2db0 Mon Sep 17 00:00:00 2001 From: "j.spijker@ultimaker.com" Date: Tue, 12 Jul 2022 11:16:06 +0200 Subject: 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 -- cgit v1.2.3 From b3c60eb34bab0901a10a4acb786576a20a092d62 Mon Sep 17 00:00:00 2001 From: "j.spijker@ultimaker.com" Date: Tue, 12 Jul 2022 11:32:04 +0200 Subject: 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) -- cgit v1.2.3 From 8ae326d7a514566f31bf73dcefdd2cf9c4227761 Mon Sep 17 00:00:00 2001 From: "j.spijker@ultimaker.com" Date: Tue, 12 Jul 2022 11:45:20 +0200 Subject: 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}") -- cgit v1.2.3 From 51da6ca87b7647feb31a928671e01f48c71c887a Mon Sep 17 00:00:00 2001 From: "j.spijker@ultimaker.com" Date: Tue, 12 Jul 2022 11:49:06 +0200 Subject: 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") -- cgit v1.2.3 From b268657fbdedd768676749eeb9fd2a2c21850ec7 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Tue, 12 Jul 2022 12:18:38 +0200 Subject: 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 }, -- cgit v1.2.3 From 2a2945bcfe27d8e8c19df3cf2faaa7c897804220 Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Wed, 13 Jul 2022 09:25:16 +0200 Subject: 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 -- cgit v1.2.3 From 32eefbb404c1430e5542938bb8f0c2689407614c Mon Sep 17 00:00:00 2001 From: "p.kuiper" Date: Wed, 13 Jul 2022 16:29:18 +0200 Subject: 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 + resources/quality/ultimaker3/um3_aa0.4_BAM_Normal_Quality.inst.cfg | 1 + resources/quality/ultimaker3/um3_bb0.4_PVA_Fast_Print.inst.cfg | 1 + resources/quality/ultimaker3/um3_bb0.4_PVA_High_Quality.inst.cfg | 1 + resources/quality/ultimaker3/um3_bb0.4_PVA_Normal_Quality.inst.cfg | 1 + resources/quality/ultimaker3/um3_bb0.8_PVA_Superdraft_Print.inst.cfg | 1 - resources/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 +-- resources/quality/ultimaker3/um3_global_Normal_Quality.inst.cfg | 1 - resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Fast_Print.inst.cfg | 1 + resources/quality/ultimaker_s3/um_s3_aa0.4_BAM_Normal_Quality.inst.cfg | 1 + resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Fast_Print.inst.cfg | 1 + resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_High_Quality.inst.cfg | 1 + resources/quality/ultimaker_s3/um_s3_bb0.4_PVA_Normal_Quality.inst.cfg | 1 + resources/quality/ultimaker_s3/um_s3_global_Fast_Quality.inst.cfg | 1 - resources/quality/ultimaker_s3/um_s3_global_High_Quality.inst.cfg | 1 - resources/quality/ultimaker_s3/um_s3_global_Normal_Quality.inst.cfg | 1 - resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Fast_Print.inst.cfg | 1 + resources/quality/ultimaker_s5/um_s5_aa0.4_BAM_Normal_Quality.inst.cfg | 1 + resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Fast_Print.inst.cfg | 1 + resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_High_Quality.inst.cfg | 1 + resources/quality/ultimaker_s5/um_s5_bb0.4_PVA_Normal_Quality.inst.cfg | 1 + resources/quality/ultimaker_s5/um_s5_global_Fast_Quality.inst.cfg | 1 - resources/quality/ultimaker_s5/um_s5_global_High_Quality.inst.cfg | 1 - resources/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 -- cgit v1.2.3