Orca 2.5 per extruder layer height

.github/workflows/build_all.yml

@@ -85,16 +85,20 @@ jobs:
       arch: universal
       macos-combine-only: true
     secrets: inherit
-  # The macOS dSYM is only produced by the universal combine leg above, so it is
-  # uploaded here rather than from build_deps.yml (which handles the Windows PDB).
-  upload_symbols_macos:
-    name: Upload macOS Debug Symbols to Sentry
-    needs: build_macos_universal
-    if: ${{ !cancelled() && needs.build_macos_universal.result == 'success' && !vars.SELF_HOSTED }}
+  # One Sentry upload for every platform: the macOS dSYM from the universal
+  # combine leg, the Windows PDB from the x64 build leg and the unstripped
+  # Linux binaries. upload-dif handles all formats from a single runner.
+  upload_symbols:
+    name: Upload Debug Symbols to Sentry
+    needs: [build_macos_universal, build_windows, build_linux]
+    # Needs the Sentry org secrets; forks without them skip instead of failing.
+    if: ${{ !cancelled() && !vars.SELF_HOSTED && (needs.build_macos_universal.result == 'success' || needs.build_windows.result == 'success' || needs.build_linux.result == 'success') && (github.repository_owner == 'Snapmaker' || vars.SENTRY_UPLOAD == '1') }}
     uses: ./.github/workflows/sentry_cli.yml
     with:
-      os: macos-14
-      dsym-artifact-name: dSYM_Mac_${{ needs.build_macos_universal.outputs.release }}
+      os: ubuntu-latest
+      pdb-artifact-name: PDB
+      dsym-artifact-name: ${{ needs.build_macos_universal.result == 'success' && format('dSYM_Mac_{0}', needs.build_macos_universal.outputs.release) || '' }}
+      linux-symbols-pattern: Linux_symbols_*
       release: ${{ needs.build_macos_universal.outputs.release || github.sha }}
     secrets: inherit
   # One test job per built arch, on the runner that built it.

.github/workflows/build_deps.yml

@@ -209,18 +209,3 @@ jobs:
       os: ${{ inputs.os }}
       arch: ${{ inputs.arch }}
     secrets: inherit
-
-  # Only the Windows x64 leg produces a PDB artifact (see build_orca.yml: "Pack
-  # PDB"/"Upload artifacts Win PDB" skip arm64). The macOS dSYM is produced by the
-  # universal *combine* leg, which build_all.yml calls directly rather than through
-  # this workflow -- build_all.yml's upload_symbols_macos job handles that.
-  upload_symbols:
-    name: Upload Debug Symbols to Sentry
-    needs: [build_orca]
-    if: ${{ !cancelled() && needs.build_orca.result == 'success' && (startsWith(inputs.os, 'windows') || inputs.os == 'orca-win-server') && inputs.arch != 'arm64' }}
-    uses: ./.github/workflows/sentry_cli.yml
-    with:
-      os: ${{ inputs.os }}
-      pdb-artifact-name: PDB
-      release: ${{ needs.build_orca.outputs.release || github.sha }}
-    secrets: inherit

.github/workflows/build_orca.yml

@@ -175,7 +175,9 @@ jobs:
       - name: Pack unit tests mac
         if: runner.os == 'macOS' && !inputs.macos-combine-only && inputs.arch == 'arm64'
         working-directory: ${{ github.workspace }}
-        run: tar -cvf build_tests.tar build/arm64/tests
+        # The test binaries load libsentry.dylib through an rpath into the deps
+        # prefix; ship it at that path so the unit-test runner can resolve it.
+        run: tar -cvf build_tests.tar build/arm64/tests deps/build/arm64/OrcaSlicer_dep/usr/local/lib/libsentry.dylib
 
       - name: Upload Test Artifact mac
         if: runner.os == 'macOS' && !inputs.macos-combine-only && inputs.arch == 'arm64'
@@ -193,7 +195,7 @@ jobs:
         shell: bash
         # The bundle was already packed from resources/, so the caches have to be
         # installed into it here; the source tree keeps its JSONs for later jobs.
-        run: ./scripts/build_preset_cache.sh -b build/${{ inputs.arch }} build/${{ inputs.arch }}/OrcaSlicer/OrcaSlicer.app/Contents/Resources/profiles
+        run: ./scripts/build_preset_cache.sh -b build/${{ inputs.arch }} "build/${{ inputs.arch }}/Snapmaker_Orca/Snapmaker Orca.app/Contents/Resources/profiles"
 
       - name: Pack macOS app bundle ${{ inputs.arch }}
         if: runner.os == 'macOS' && !inputs.macos-combine-only
@@ -461,7 +463,7 @@ jobs:
         shell: cmd
         # Shipped into both the already-installed tree (portable zip, MSIX) and
         # the checkout cpack re-installs from when it builds the NSIS installer.
-        run: scripts\build_preset_cache.bat --prune-source "%BUILD_DIR%" "resources\profiles" "%BUILD_DIR%\OrcaSlicer\resources\profiles"
+        run: scripts\build_preset_cache.bat --prune-source "%BUILD_DIR%" "resources\profiles" "%BUILD_DIR%\Snapmaker_Orca\resources\profiles"
 
       - name: Pack unit tests Win
         if: runner.os == 'Windows'
@@ -513,7 +515,7 @@ jobs:
           name: Snapmaker_Orca_Windows_${{ env.ver }}${{ env.ARCH_SUFFIX }}
           path: ${{ github.workspace }}/${{ env.BUILD_DIR }}/Snapmaker_Orca*.exe
 
-      # sentry_cli.yml consumes this artifact name (via build_deps.yml).
+      # sentry_cli.yml consumes this artifact name (via build_all.yml).
       - name: Upload artifacts Win PDB
         if: runner.os == 'Windows' && inputs.arch != 'arm64'
         uses: actions/upload-artifact@v7
@@ -583,6 +585,27 @@ jobs:
           chmod +x "$appimage"
           tar -cvf build_tests.tar build/tests
 
+        # The unstripped build-tree binary carries the symtab Sentry needs; the
+        # AppImage ships the same build (same ELF build-id). Arch subdir keeps the
+        # two Linux legs from colliding in the unified symbol upload.
+      - name: Pack Linux symbols
+        if: runner.os == 'Linux'
+        shell: bash
+        run: |
+          arch=${{ inputs.arch == 'aarch64' && 'aarch64' || 'x86_64' }}
+          mkdir -p symbols_linux/$arch
+          cp build/src/Release/snapmaker-orca symbols_linux/$arch/
+
+      - name: Upload Linux symbols artifact
+        if: runner.os == 'Linux'
+        uses: actions/upload-artifact@v7
+        with:
+          name: Linux_symbols_${{ inputs.arch == 'aarch64' && 'aarch64' || 'x86_64' }}
+          overwrite: true
+          path: symbols_linux
+          retention-days: 5
+          if-no-files-found: error
+
         # Use tar because upload-artifacts won't always preserve directory structure
         # and doesn't preserve file permissions
       - name: Upload Test Artifact
@@ -602,7 +625,7 @@ jobs:
           # Both were packed from resources/ before the caches existed, so the
           # AppImage is unpacked first and the caches shipped into it and into
           # the package tree; the source tree keeps its JSONs for later steps.
-          appimage=$(find build -maxdepth 1 -name "OrcaSlicer_Linux_AppImage*.AppImage" | head -1)
+          appimage=$(find build -maxdepth 1 -name "Snapmaker_Orca_Linux_AppImage*.AppImage" | head -1)
           chmod +x "$appimage"
           "$appimage" --appimage-extract
           ./scripts/build_preset_cache.sh -b build build/package/resources/profiles squashfs-root/resources/profiles

.github/workflows/sentry_cli.yml

@@ -1,169 +1,133 @@
 name: Upload Debug Symbols to Sentry
 
+# One upload for every platform: sentry-cli's upload-dif is format-agnostic, so
+# a single runner ships the Windows PDBs, the macOS dSYMs and the unstripped
+# Linux ELF binaries together. Artifact downloads are tolerant -
+# whatever symbol artifacts this run produced get uploaded, the rest are
+# reported as warnings instead of failing the run.
 on:
   workflow_call:
     inputs:
       os:
         required: true
         type: string
-        # Steps below gate on `runner.os`, not on this string, so any Windows /
-        # macOS / Linux runner label (incl. self-hosted orca-*-server) works.
-        description: "Runner label to run the upload on (e.g. windows-latest, macos-14, ubuntu-24.04)"
+        description: "Runner label to run the upload on (e.g. ubuntu-24.04)"
       pdb-artifact-name:
         required: false
         type: string
-        description: "Artifact name for Windows PDB archive (e.g., 'PDB')"
+        description: "Artifact name for the Windows PDB archive (e.g. 'PDB'); empty skips it"
       dsym-artifact-name:
         required: false
         type: string
-        description: "Artifact name for macOS dSYM archive (e.g., 'dSYM_Mac_V1.0.0')"
+        description: "Artifact name for the macOS dSYM archive (e.g. 'dSYM_Mac_V1.0.0'); empty skips it"
+      linux-symbols-pattern:
+        required: false
+        type: string
+        description: "Artifact name pattern for Linux ELF symbols (e.g. 'Linux_symbols_*'); empty skips it"
       release:
-        required: true
+        required: false
         type: string
-        description: "Release version/tag"
+        description: "Release version/tag (informational; upload-dif auto-associates releases)"
 
 jobs:
   upload_symbols:
     name: Upload Debug Symbols to Sentry
     runs-on: ${{ inputs.os }}
     steps:
-      # ==================== Windows ====================
-      - name: "[Windows] Install sentry-cli via choco"
-        if: runner.os == 'Windows' && inputs.pdb-artifact-name != ''
-        shell: pwsh
-        run: |
-          choco install sentry-cli -y -y 2>&1 | Out-Null
-
-      - name: "[Windows] Download PDB artifact"
-        if: runner.os == 'Windows' && inputs.pdb-artifact-name != ''
-        uses: actions/download-artifact@v8
-        with:
-          name: ${{ inputs.pdb-artifact-name }}
-          path: ./symbols
-
-      - name: "[Windows] Extract PDB archive"
-        if: runner.os == 'Windows' && inputs.pdb-artifact-name != ''
-        shell: pwsh
+      - name: Install sentry-cli
+        shell: bash
         run: |
-          $archive = Get-ChildItem -Path ./symbols -Filter "*.7z" -File | Select-Object -First 1
-          if ($archive) {
-            Write-Host "Found archive: $($archive.FullName)"
-            Write-Host "Extracting to ./symbols/extracted ..."
-            7z x "$($archive.FullName)" -o"./symbols/extracted" -y
-            if ($LASTEXITCODE -ne 0) {
-              Write-Host "::error::Failed to extract archive with exit code $LASTEXITCODE"
-              exit $LASTEXITCODE
-            }
-            Write-Host "Extraction complete. Contents:"
-            Get-ChildItem -Path ./symbols/extracted -Recurse | ForEach-Object { Write-Host "  $($_.FullName)" }
-          } else {
-            Write-Host "No .7z archive found, assuming PDB files are already extracted"
-            Get-ChildItem -Path ./symbols -Recurse | ForEach-Object { Write-Host "  Found: $($_.FullName)" }
-          }
-
-      - name: "[Windows] Upload PDB to Sentry (sentry-cli)"
-        if: runner.os == 'Windows' && inputs.pdb-artifact-name != ''
-        shell: pwsh
-        env:
-          SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
-          SENTRY_LOG_LEVEL: debug
-        run: |
-          # Determine upload path - prefer extracted folder if it exists
-          $uploadPath = "./symbols"
-          if (Test-Path "./symbols/extracted") {
-            $uploadPath = "./symbols/extracted"
-          }
-
-          $pdbFiles = Get-ChildItem -Path $uploadPath -Filter "*.pdb" -File -Recurse
-          if ($pdbFiles.Count -gt 0) {
-            Write-Host "Found $($pdbFiles.Count) PDB file(s) to upload from $uploadPath :"
-            $pdbFiles | ForEach-Object { Write-Host "  - $($_.FullName)" }
-            Write-Host ""
-            Write-Host "Starting Sentry upload with debug logging..."
-            sentry-cli.exe --log-level=debug --auth-token $env:SENTRY_AUTH_TOKEN upload-dif --org "${{ secrets.SENTRY_ORG }}" --project "${{ secrets.SENTRY_PROJECT }}" $uploadPath 2>&1 | Out-Host
-            if ($LASTEXITCODE -ne 0) {
-              Write-Host "::error::Sentry upload failed with exit code $LASTEXITCODE"
-              exit $LASTEXITCODE
-            }
-          } else {
-            Write-Host "::error::No PDB files found in $uploadPath"
-            Get-ChildItem -Path ./symbols -Recurse | ForEach-Object { Write-Host "  Found: $($_.FullName)" }
-            exit 1
-          }
-
-      # ==================== macOS ====================
-      - name: "[macOS] Install sentry-cli"
-        if: runner.os == 'macOS' && inputs.dsym-artifact-name != ''
-        run: |
-          # Try multiple installation methods for reliability
-          # Method 1: Official install script (most reliable)
           if ! command -v sentry-cli &> /dev/null; then
             echo "Installing sentry-cli via official script..."
             curl -sL https://sentry.io/get-cli/ | bash || true
           fi
-
-          # Method 2: npm fallback
           if ! command -v sentry-cli &> /dev/null; then
             echo "Official script failed, trying npm..."
             npm install -g @sentry/cli || true
           fi
-
-          # Method 3: Direct binary download fallback
-          if ! command -v sentry-cli &> /dev/null; then
-            echo "npm failed, downloading binary directly..."
-            SENTRY_CLI_VERSION=$(curl -s https://api.github.com/repos/getsentry/sentry-cli/releases/latest | grep '"tag_name":' | sed -E 's/.*"([^"]+)".*/\1/')
-            curl -sL "https://github.com/getsentry/sentry-cli/releases/download/${SENTRY_CLI_VERSION}/sentry-cli-Darwin-universal" -o /usr/local/bin/sentry-cli
-            chmod +x /usr/local/bin/sentry-cli
-          fi
-
-          # Verify installation
           if command -v sentry-cli &> /dev/null; then
-            echo "sentry-cli installed successfully:"
             sentry-cli --version
           else
-            echo "::error::Failed to install sentry-cli via all methods"
+            echo "::error::Failed to install sentry-cli"
             exit 1
           fi
 
-      - name: "[macOS] Download dSYM artifact"
-        if: runner.os == 'macOS' && inputs.dsym-artifact-name != ''
+      - name: Download Windows PDB artifact
+        id: dl_pdb
+        if: inputs.pdb-artifact-name != ''
+        continue-on-error: true
+        uses: actions/download-artifact@v8
+        with:
+          name: ${{ inputs.pdb-artifact-name }}
+          path: ./symbols/windows
+
+      - name: Download macOS dSYM artifact
+        id: dl_dsym
+        if: inputs.dsym-artifact-name != ''
+        continue-on-error: true
         uses: actions/download-artifact@v8
         with:
           name: ${{ inputs.dsym-artifact-name }}
-          path: ./symbols
+          path: ./symbols/macos
 
-      - name: "[macOS] Upload dSYM to Sentry (sentry-cli)"
-        if: runner.os == 'macOS' && inputs.dsym-artifact-name != ''
+      - name: Download Linux symbols artifacts
+        id: dl_linux
+        if: inputs.linux-symbols-pattern != ''
+        continue-on-error: true
+        uses: actions/download-artifact@v8
+        with:
+          pattern: ${{ inputs.linux-symbols-pattern }}
+          merge-multiple: true
+          path: ./symbols/linux
+
+      - name: Extract archives
+        if: steps.dl_pdb.outcome == 'success' || steps.dl_dsym.outcome == 'success' || steps.dl_linux.outcome == 'success'
+        shell: bash
+        run: |
+          # The Windows PDBs ship as a .7z inside the artifact.
+          shopt -s nullglob globstar
+          for archive in ./symbols/**/*.7z; do
+            echo "Extracting $archive ..."
+            dir="$(dirname "$archive")/extracted"
+            if command -v 7z &> /dev/null; then
+              7z x "$archive" -o"$dir" -y
+            else
+              7zz x "$archive" -o"$dir" -y
+            fi
+            rm -f "$archive"
+          done
+
+      - name: Upload debug symbols to Sentry
+        if: steps.dl_pdb.outcome == 'success' || steps.dl_dsym.outcome == 'success' || steps.dl_linux.outcome == 'success'
+        shell: bash
         env:
           SENTRY_AUTH_TOKEN: ${{ secrets.SENTRY_AUTH_TOKEN }}
           SENTRY_LOG_LEVEL: debug
         run: |
-          echo "Checking for dSYM files in ./symbols..."
-          find ./symbols -name "*.dSYM" -type d | while read dsym; do
-            echo "Found dSYM: $dsym"
-          done
-
-          dsymCount=$(find ./symbols -name "*.dSYM" -type d | wc -l | tr -d ' ')
-          if [ "$dsymCount" -gt 0 ]; then
-            echo "Found $dsymCount dSYM file(s) to upload from ./symbols:"
-            find ./symbols -name "*.dSYM" -type d | while read dsym; do
-              echo "  - $dsym"
-            done
-            echo ""
-            echo "Starting Sentry upload with debug logging..."
-            # upload-dif does not support --release flag, it auto-associates with releases
-            sentry-cli --log-level=debug --auth-token "$SENTRY_AUTH_TOKEN" upload-dif --org "${{ secrets.SENTRY_ORG }}" --project "${{ secrets.SENTRY_PROJECT }}" ./symbols
-            UPLOAD_EXIT_CODE=$?
-            if [ $UPLOAD_EXIT_CODE -ne 0 ]; then
-              echo "::error::Sentry upload failed with exit code $UPLOAD_EXIT_CODE"
-              exit 1
-            fi
-          else
-            echo "::error::No dSYM files found in ./symbols"
-            echo "Contents of ./symbols:"
-            find ./symbols -type f -o -type d | head -20
+          if [ "${{ steps.dl_pdb.outcome }}" = "failure" ]; then
+            echo "::warning::PDB artifact '${{ inputs.pdb-artifact-name }}' could not be downloaded; uploading without Windows symbols"
+          fi
+          if [ "${{ steps.dl_dsym.outcome }}" = "failure" ]; then
+            echo "::warning::dSYM artifact '${{ inputs.dsym-artifact-name }}' could not be downloaded; uploading without macOS symbols"
+          fi
+          if [ "${{ steps.dl_linux.outcome }}" = "failure" ]; then
+            echo "::warning::Linux symbol artifacts '${{ inputs.linux-symbols-pattern }}' could not be downloaded; uploading without Linux symbols"
+          fi
+          pdb_count=$(find ./symbols -name "*.pdb" -type f | wc -l | tr -d ' ')
+          dsym_count=$(find ./symbols -name "*.dSYM" -type d | wc -l | tr -d ' ')
+          elf_count=$(find ./symbols/linux -type f 2>/dev/null | wc -l | tr -d ' ')
+          echo "Found $pdb_count PDB file(s), $dsym_count dSYM bundle(s), $elf_count Linux binary/binaries:"
+          find ./symbols -name "*.pdb" -type f -o -name "*.dSYM" -type d -o -path "./symbols/linux/*" -type f
+          if [ "$pdb_count" -eq 0 ] && [ "$dsym_count" -eq 0 ] && [ "$elf_count" -eq 0 ]; then
+            echo "::error::Symbol artifacts downloaded but contained no PDB, dSYM or ELF files"
+            find ./symbols | head -40
             exit 1
           fi
+          # upload-dif does not support --release; it auto-associates with releases
+          sentry-cli --log-level=debug --auth-token "$SENTRY_AUTH_TOKEN" upload-dif \
+            --org "${{ secrets.SENTRY_ORG }}" --project "${{ secrets.SENTRY_PROJECT }}" ./symbols
 
-      # ==================== Linux ====================
-
+      - name: Nothing to upload
+        if: steps.dl_pdb.outcome != 'success' && steps.dl_dsym.outcome != 'success' && steps.dl_linux.outcome != 'success'
+        shell: bash
+        run: echo "::warning::No symbol artifacts were available in this run; nothing uploaded to Sentry"

CMakeLists.txt

@@ -148,8 +148,9 @@ option(SLIC3R_MSVC_COMPILE_PARALLEL "Compile on Visual Studio in parallel" 1)
 option(SLIC3R_MSVC_PDB          "Generate PDB files on MSVC in Release mode" 1)
 option(SLIC3R_ASAN              "Enable ASan on Clang and GCC" 0)
 
-# Sentry crash reporting - enabled only on Windows/macOS by default
-if (WIN32 OR APPLE)
+# Sentry crash reporting - on by default everywhere except the Flatpak build
+# (Flathub distribution stays telemetry-free).
+if (WIN32 OR APPLE OR (UNIX AND NOT FLATPAK))
     set(SLIC3R_SENTRY_DEFAULT ON)
 else()
     set(SLIC3R_SENTRY_DEFAULT OFF)