Merge branch 'CURA-11080_use_openssl_3' into CURA-11137_update_pyqt6

Ultimaker · Dec 1, 2023 · afc8c04 · afc8c04
2 parents 24a0ba3 + 10b69e8
commit afc8c04
Show file tree

Hide file tree

Showing 408 changed files with 10,614 additions and 12,818 deletions.
diff --git a/.github/ISSUE_TEMPLATE/SlicingCrash.yaml b/.github/ISSUE_TEMPLATE/SlicingCrash.yaml
@@ -23,14 +23,14 @@ body:
 - type: input
   attributes:
     label: Cura Version
-    placeholder: 5.3.1
+    placeholder: 5.6.0
   validations:
     required: true
 - type: markdown
   attributes:
     value: |
-      We work hard on improving our slicing crashes. Our most recent release is 5.3.1.
-      If you are not on the latest version of Cura, [you can download it here](https://github.com/Ultimaker/Cura/releases/tag/5.3.1)
+      We work hard on improving our slicing crashes. Our most recent release is 5.6.0.
+      If you are not on the latest version of Cura, [you can download it here](https://github.com/Ultimaker/Cura/releases/latest)
 - type: input
   attributes:
     label: Operating System

diff --git a/.github/workflows/conan-package-create.yml b/.github/workflows/conan-package-create.yml
@@ -139,7 +139,10 @@ jobs:
           conan config install https://github.com/Ultimaker/conan-config.git -a "-b runner/${{ runner.os }}/${{ runner.arch }}"
 
       - name: Add Cura private Artifactory remote
-        run: conan remote add cura-private https://ultimaker.jfrog.io/artifactory/api/conan/cura-private True
+        run: conan remote add cura-private-conan-dev https://cura.jfrog.io/artifactory/api/conan/cura-private-conan-dev True
+
+      - name: Set GH service account for remote cura-conan-dev
+        run: conan user -p ${{ secrets.CONAN_GH_RUNNER_PASS }} -r cura-private-conan-dev "${{ secrets.CONAN_GH_RUNNER_USER }}"
 
       - name: Create the Packages
         run: conan install ${{ inputs.recipe_id_full }} --build=missing --update -c tools.build:skip_test=True
@@ -150,4 +153,4 @@ jobs:
 
       - name: Upload the Package(s) to the private Artifactory
         if: ${{ always() && ! inputs.conan_upload_community }}
-        run: conan upload ${{ inputs.recipe_id_full }} -r cura-private --all -c
+        run: conan upload ${{ inputs.recipe_id_full }} -r cura-private-conan-dev --all -c
diff --git a/.github/workflows/conan-package.yml b/.github/workflows/conan-package.yml
@@ -41,12 +41,12 @@ on:
     branches:
       - main
       - 'CURA-*'
-      - '[1-9].[0-9]'
-      - '[1-9].[0-9][0-9]'
+      - '[0-9].[0-9]'
+      - '[0-9].[0-9][0-9]'
     tags:
-      - '[1-9].[0-9].[0-9]*'
-      - '[1-9].[0-9].[0-9]'
-      - '[1-9].[0-9][0-9].[0-9]*'
+      - '[0-9].[0-9].[0-9]*'
+      - '[0-9].[0-9].[0-9]'
+      - '[0-9].[0-9][0-9].[0-9]*'
 
 env:
   CONAN_LOGIN_USERNAME_CURA: ${{ secrets.CONAN_USER }}
@@ -102,7 +102,7 @@ jobs:
           sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
           sudo apt update
           sudo apt upgrade
-          sudo apt install efibootmgr 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 pkg-config flex bison g++-12 gcc-12 -y
+          sudo apt install efibootmgr 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 pkg-config flex bison libxcb-cursor-dev g++-12 gcc-12 -y
 
       - name: Install GCC-13
         run: |
@@ -119,7 +119,7 @@ jobs:
           conan config install https://github.com/Ultimaker/conan-config.git -a "-b runner/${{ runner.os }}/${{ runner.arch }}"
 
       - name: Create the Packages
-        run: conan create . ${{ needs.conan-recipe-version.outputs.recipe_id_full }} --build=missing --update -o ${{ needs.conan-recipe-version.outputs.project_name }}:devtools=True -c tools.build:skip_test=True
+        run: conan create . ${{ needs.conan-recipe-version.outputs.recipe_id_full }} --build=missing --update -o ${{ needs.conan-recipe-version.outputs.project_name }}:devtools=True -o ${{ needs.conan-recipe-version.outputs.project_name }}:enable_i18n=True -c tools.build:skip_test=True
 
       - name: Create the latest alias
         if: always()

diff --git a/.github/workflows/conan-recipe-export.yml b/.github/workflows/conan-recipe-export.yml
@@ -80,7 +80,10 @@ jobs:
           conan config install https://github.com/Ultimaker/conan-config.git -a "-b runner/${{ runner.os }}/${{ runner.arch }}"
 
       - name: Add Cura private Artifactory remote
-        run: conan remote add cura-private https://ultimaker.jfrog.io/artifactory/api/conan/cura-private True
+        run: conan remote add cura-private-conan-dev https://cura.jfrog.io/artifactory/api/conan/cura-private-conan-dev True
+
+      - name: Set GH service account for remote cura-conan-dev
+        run: conan user -p ${{ secrets.CONAN_GH_RUNNER_PASS }} -r cura-private-conan-dev "${{ secrets.CONAN_GH_RUNNER_USER }}"
 
       - name: Export the Package (binaries)
         if: ${{ inputs.conan_export_binaries }}
@@ -103,5 +106,5 @@ jobs:
       - name: Upload the Package(s) to the private Artifactory
         if: ${{ always() && ! inputs.conan_upload_community }}
         run: |
-          conan upload ${{ inputs.recipe_id_full }} -r cura-private --all -c
-          conan upload ${{ inputs.recipe_id_latest }} -r cura-private -c
+          conan upload ${{ inputs.recipe_id_full }} -r cura-private-conan-dev --all -c
+          conan upload ${{ inputs.recipe_id_latest }} -r cura-private-conan-dev -c
diff --git a/.github/workflows/installers.yml b/.github/workflows/installers.yml
@@ -31,28 +31,41 @@ on:
         type: boolean
 
   schedule:
-    # Daily at 5:15 CET
+    # Daily at 4:15 CET (main-branch) and 5:15 CET (release-branch)
     - cron: '15 3 * * *'
+    - cron: '15 4 * * *'
 
 env:
-  CURA_CONAN_VERSION: ${{ inputs.cura_conan_version || 'cura/latest@ultimaker/testing' }}
   CONAN_ARGS: ${{ inputs.conan_args || '' }}
   ENTERPRISE: ${{ inputs.enterprise || false }}
   STAGING: ${{ inputs.staging || false }}
+  LATEST_RELEASE: '5.6'
+  LATEST_RELEASE_SCHEDULE_HOUR: 4
 
 jobs:
-  default-values:
+  default_values:
     runs-on: ubuntu-latest
     outputs:
       cura_conan_version: ${{ steps.default.outputs.cura_conan_version  }}
+      release_tag: ${{ steps.default.outputs.release_tag  }}
 
     steps:
     - name: Output default values
       id: default
       shell: python
       run: |
         import os
-        cura_conan_version = "cura/latest@ultimaker/testing" if "${{ github.event.inputs.cura_conan_version }}" == "" else "${{ github.event.inputs.cura_conan_version }}" 
+        import datetime
+        
+        if "${{ github.event_name }}" != "schedule":
+            cura_conan_version = "${{ github.event.inputs.cura_conan_version }}"
+        else:
+            now = datetime.datetime.now()
+            cura_conan_version = "cura/latest@ultimaker/stable" if now.hour == int(os.environ['LATEST_RELEASE_SCHEDULE_HOUR']) else "cura/latest@ultimaker/testing"
+        
+        release_tag = f"nightly-{os.environ['LATEST_RELEASE']}" if "/stable" in cura_conan_version else "nightly"
+
+        # Set cura_conan_version environment variable
         output_env = os.environ["GITHUB_OUTPUT"]
         content = ""
         if os.path.exists(output_env):
@@ -61,12 +74,24 @@ jobs:
         with open(output_env, "w") as f:
             f.write(content)
             f.writelines(f"cura_conan_version={cura_conan_version}\n")
+            f.writelines(f"release_tag={release_tag}\n")
+
+        summary_env = os.environ["GITHUB_STEP_SUMMARY"]
+        content = ""
+        if os.path.exists(summary_env):
+            with open(summary_env, "r") as f:
+                content = f.read()
+        
+        with open(summary_env, "w") as f:
+            f.write(content)
+            f.writelines(f"# cura_conan_version = {cura_conan_version}\n")
+            f.writelines(f"# release_tag = {release_tag}\n")
 
   windows-installer:
     uses: ./.github/workflows/windows.yml
-    needs: [ default-values ]
+    needs: [ default_values ]
     with:
-      cura_conan_version: ${{ needs.default-values.outputs.cura_conan_version }}
+      cura_conan_version: ${{ needs.default_values.outputs.cura_conan_version }}
       conan_args: ${{ github.event.inputs.conan_args }}
       enterprise: ${{ github.event.inputs.enterprise == 'true' }}
       staging: ${{ github.event.inputs.staging == 'true' }}
@@ -76,9 +101,9 @@ jobs:
 
   linux-installer:
     uses: ./.github/workflows/linux.yml
-    needs: [ default-values ]
+    needs: [ default_values ]
     with:
-      cura_conan_version: ${{ needs.default-values.outputs.cura_conan_version }}
+      cura_conan_version: ${{ needs.default_values.outputs.cura_conan_version }}
       conan_args: ${{ github.event.inputs.conan_args }}
       enterprise: ${{ github.event.inputs.enterprise == 'true' }}
       staging: ${{ github.event.inputs.staging == 'true' }}
@@ -88,33 +113,33 @@ jobs:
 
   macos-installer:
     uses: ./.github/workflows/macos.yml
-    needs: [ default-values ]
+    needs: [ default_values ]
     with:
-      cura_conan_version: ${{ needs.default-values.outputs.cura_conan_version }}
+      cura_conan_version: ${{ needs.default_values.outputs.cura_conan_version }}
       conan_args: ${{ github.event.inputs.conan_args }}
       enterprise: ${{ github.event.inputs.enterprise == 'true' }}
       staging: ${{ github.event.inputs.staging == 'true' }}
       architecture: X64
-      operating_system: macos-11.0
+      operating_system: self-hosted-X64
     secrets: inherit
 
   macos-arm-installer:
     uses: ./.github/workflows/macos.yml
-    needs: [ default-values ]
+    needs: [ default_values ]
     with:
-      cura_conan_version: ${{ needs.default-values.outputs.cura_conan_version }}
+      cura_conan_version: ${{ needs.default_values.outputs.cura_conan_version }}
       conan_args: ${{ github.event.inputs.conan_args }}
       enterprise: ${{ github.event.inputs.enterprise == 'true' }}
       staging: ${{ github.event.inputs.staging == 'true' }}
       architecture: ARM64
-      operating_system: self-hosted
+      operating_system: self-hosted-ARM64
     secrets: inherit
 
   # Run and update nightly release when the nightly input is set to true or if the schedule is triggered
   update-nightly-release:
     if: ${{ inputs.nightly || github.event_name == 'schedule' }}
     runs-on: ubuntu-latest
-    needs: [ windows-installer, linux-installer, macos-installer, macos-arm-installer ]
+    needs: [ default_values, windows-installer, linux-installer, macos-installer, macos-arm-installer ]
     steps:
       - name: Checkout
         uses: actions/checkout@v3
@@ -182,8 +207,8 @@ jobs:
 
       - name: Update nightly release for Linux
         run: |
-          gh release upload nightly installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-linux-X64.AppImage --clobber
-          gh release upload nightly installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-linux-X64.AppImage.asc  --clobber
+          gh release upload ${{ needs.default_values.outputs.release_tag }} installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-linux-X64.AppImage --clobber
+          gh release upload ${{ needs.default_values.outputs.release_tag }} installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-linux-X64.AppImage.asc  --clobber
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
@@ -206,8 +231,8 @@ jobs:
 
       - name: Update nightly release for Windows
         run: |
-          gh release upload nightly installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-win64-X64.msi --clobber
-          gh release upload nightly installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-win64-X64.exe --clobber
+          gh release upload ${{ needs.default_values.outputs.release_tag }} installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-win64-X64.msi --clobber
+          gh release upload ${{ needs.default_values.outputs.release_tag }} installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-win64-X64.exe --clobber
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
@@ -230,8 +255,8 @@ jobs:
 
       - name: Update nightly release for MacOS (X64)
         run: |
-          gh release upload nightly installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-macos-X64.dmg --clobber
-          gh release upload nightly installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-macos-X64.pkg --clobber
+          gh release upload ${{ needs.default_values.outputs.release_tag }} installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-macos-X64.dmg --clobber
+          gh release upload ${{ needs.default_values.outputs.release_tag }} installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-macos-X64.pkg --clobber
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
@@ -254,14 +279,32 @@ jobs:
 
       - name: Update nightly release for MacOS (ARM-64)
         run: |
-          gh release upload nightly installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-macos-ARM64.dmg --clobber
-          gh release upload nightly installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-macos-ARM64.pkg --clobber
+          gh release upload ${{ needs.default_values.outputs.release_tag }} installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-macos-ARM64.dmg --clobber
+          gh release upload ${{ needs.default_values.outputs.release_tag }} installers/${{ steps.filename.outputs.NIGHTLY_NAME }}-macos-ARM64.pkg --clobber
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: create the release notes
+        shell: python
+        run: |
+          import os
+          import datetime
+          from jinja2 import Template
+          
+          with open(".github/workflows/release_notes.md.jinja", "r") as f:
+              release_notes = Template(f.read())
+          
+          current_nightly_beta = "${{ needs.default_values.outputs.release_tag }}".split("nightly-")[-1]
+          with open("release-notes.md", "w") as f:
+              f.write(release_notes.render(
+                timestamp="${{ steps.filename.outputs.NIGHTLY_TIME }}",
+                branch="" if "${{ needs.default-values.outputs.release_tag == 'nightly' }}" == 'true' else current_nightly_beta,
+                branch_specific="" if os.getenv("GITHUB_REF") == "refs/heads/main" else f"?branch={current_nightly_beta}",
+              ))
+
       - name: Update nightly release description (with date)
         if: always()
         run: |
-          gh release edit nightly --title "${{ steps.filename.outputs.NIGHTLY_NAME }}" --notes "Nightly release created on: ${{ steps.filename.outputs.NIGHTLY_TIME }}"
+          gh release edit ${{ needs.default_values.outputs.release_tag }} --title "${{ steps.filename.outputs.NIGHTLY_NAME }}" --notes-file release-notes.md
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}