Merge branch 'main' into feature/auto-update

.github/workflows/build_all.yml

@@ -49,20 +49,17 @@ concurrency:
   
 
 jobs:
-  # TODO: Re-enable after auto-update testing is complete
-  # build_linux: # Separate so unit tests can wait on just Linux builds to complete.
+  # build_linux:
   #   name: Build Linux
   #   strategy:
   #     fail-fast: false
   #   # Don't run scheduled builds on forks:
   #   if: ${{ !cancelled() && (github.event_name != 'schedule' || github.repository == 'OrcaSlicer/OrcaSlicer') }}
-  #   uses: ./.github/workflows/build_deps.yml
+  #   uses: ./.github/workflows/build_check_cache.yml
   #   with:
   #     os: ubuntu-24.04
   #     build-deps-only: ${{ inputs.build-deps-only || false }}
-  #     force-build: ${{ github.event_name == 'schedule' }}
   #   secrets: inherit
-
   build_all:
     name: Build macOS (testing auto-update)
     strategy:
@@ -75,14 +72,13 @@ jobs:
             arch: arm64
     # Don't run scheduled builds on forks:
     if: ${{ !cancelled() && (github.event_name != 'schedule' || github.repository == 'OrcaSlicer/OrcaSlicer') }}
-    uses: ./.github/workflows/build_deps.yml
+    uses: ./.github/workflows/build_check_cache.yml
     with:
       os: ${{ matrix.os }}
       arch: ${{ matrix.arch }}
       build-deps-only: ${{ inputs.build-deps-only || false }}
       force-build: ${{ github.event_name == 'schedule' }}
     secrets: inherit
-  # TODO: Re-enable after auto-update testing is complete (depends on build_linux)
   # unit_tests:
   #   name: Unit Tests
   #   runs-on: ubuntu-24.04
@@ -118,7 +114,7 @@ jobs:
   #         path: build/tests/**/*.log
   #     - name: Publish Test Results
   #       if: always()
-  #       uses: EnricoMi/publish-unit-test-result-action/linux@v2
+  #       uses: EnricoMi/publish-unit-test-result-action@v2
   #       with:
   #         files: "ctest_results.xml"
   # flatpak:

.github/workflows/build_check_cache.yml

@@ -0,0 +1,62 @@
+name: Check Cache
+
+on:
+  workflow_call:
+    inputs:
+      os:
+        required: true
+        type: string
+      arch:
+        required: false
+        type: string
+      build-deps-only:
+        required: false
+        type: boolean
+      force-build:
+        required: false
+        type: boolean
+  
+jobs:
+  check_cache: # determines if there is a cache and outputs variables used in caching process
+    name: Check Cache
+    runs-on: ${{ inputs.os }}
+    outputs:
+      cache-key: ${{ steps.set_outputs.outputs.cache-key }}
+      cache-path: ${{ steps.set_outputs.outputs.cache-path }}
+      valid-cache: ${{ steps.cache_deps.outputs.cache-hit }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v6
+        with:
+          lfs: 'true'
+        
+      - name: set outputs
+        id: set_outputs
+        env:
+          dep-folder-name: ${{ inputs.os != 'macos-14' && '/OrcaSlicer_dep' || '' }}
+          output-cmd: ${{ inputs.os == 'windows-latest' && '$env:GITHUB_OUTPUT' || '"$GITHUB_OUTPUT"'}}
+        run: |
+          echo cache-key=${{ inputs.os }}-cache-orcaslicer_deps-build-${{ hashFiles('deps/**') }} >> ${{ env.output-cmd }}
+          echo cache-path=${{ github.workspace }}/deps/build${{ env.dep-folder-name }} >> ${{ env.output-cmd }}
+            
+      - name: load cache
+        id: cache_deps
+        uses: actions/cache@v5
+        with:
+          path: ${{ steps.set_outputs.outputs.cache-path }}
+          key: ${{ steps.set_outputs.outputs.cache-key }}
+          lookup-only: true
+        
+  build_deps: # call next step
+    name: Build Deps
+    needs: [check_cache]
+    uses: ./.github/workflows/build_deps.yml
+    with:
+      cache-key: ${{ needs.check_cache.outputs.cache-key }}
+      cache-path: ${{ needs.check_cache.outputs.cache-path }}
+      valid-cache: ${{ needs.check_cache.outputs.valid-cache == 'true' }}
+      os: ${{ inputs.os }}
+      arch: ${{ inputs.arch }}
+      build-deps-only: ${{ inputs.build-deps-only }}
+      force-build: ${{ inputs.force-build }}
+    secrets: inherit

.github/workflows/build_deps.yml

@@ -1,6 +1,15 @@
 on:
   workflow_call:
     inputs:
+      cache-key:
+        required: true
+        type: string
+      cache-path:
+        required: true
+        type: string
+      valid-cache:
+        required: true
+        type: boolean
       os:
         required: true
         type: string
@@ -17,62 +26,55 @@ on:
 jobs:
   build_deps:
     name: Build Deps
+    if: ${{ !cancelled() && (inputs.build-deps-only || inputs.force-build || inputs.valid-cache != true) }}
     runs-on: ${{ inputs.os }}
-    outputs:
-      artifact-name: ${{ env.ARTIFACT_NAME }}
-      artifact-path: ${{ env.DEPS_PATH }}
     env:
-      DO_BUILD: ${{ inputs.build-deps-only || inputs.force-build }}
-      DEPS_PATH: ${{ github.workspace }}/deps/build${{ inputs.os != 'macos-14' && '/OrcaSlicer_dep' || '' }}
-      ARTIFACT_NAME: OrcaSlicer_dep_${{ inputs.os }}_${{ inputs.arch }}
+      date:
     steps:
+
+      # Setup the environment
       - name: Checkout
         uses: actions/checkout@v6
         with:
           lfs: 'true'
 
-      # Cached deps are just the final outputs, no intermediate files.
-      # So building XOR cache loading.
-      # We use `lookup-only` to skip pulling cache.
       - name: load cached deps
-        uses: actions/cache/restore@v5
-        id: cache-load
+        uses: actions/cache@v5
         with:
-          path: ${{ env.DEPS_PATH }}
-          key: ${{ inputs.os }}-${{ inputs.arch }}-cache-orcaslicer_deps-build-${{ hashFiles('deps/**') }}
-          lookup-only: ${{ env.DO_BUILD == 'true' }}  # Doing this instead of `if` preserves the outputs of this step
+          path: ${{ inputs.cache-path }}
+          key: ${{ inputs.cache-key }}
 
       - uses: lukka/get-cmake@latest
-        if: ${{ !cancelled() && (env.DO_BUILD == 'true' || steps.cache-load.outputs.cache-hit != 'true') }}
         with:
           cmakeVersion: "~3.28.0"  # use most recent 3.28.x version
 
       - name: setup dev on Windows
-        if: ${{ !cancelled() && (env.DO_BUILD == 'true' || steps.cache-load.outputs.cache-hit != 'true') && inputs.os == 'windows-latest' }}
+        if: inputs.os == 'windows-latest'
         uses: microsoft/setup-msbuild@v2
 
       - name: Get the date on Ubuntu and macOS
-        if: ${{ !cancelled() && (env.DO_BUILD == 'true' || steps.cache-load.outputs.cache-hit != 'true') && inputs.os != 'windows-latest' }}
+        if: inputs.os != 'windows-latest'
         run: echo "date=$(date +'%Y%m%d')" >> $GITHUB_ENV
         shell: bash
 
       - name: Get the date on Windows
-        if: ${{ !cancelled() && (env.DO_BUILD == 'true' || steps.cache-load.outputs.cache-hit != 'true') && inputs.os == 'windows-latest' }}
+        if: inputs.os == 'windows-latest'
         run: echo "date=$(Get-Date -Format 'yyyyMMdd')" | Out-File -Append -FilePath $env:GITHUB_ENV -Encoding utf8
         shell: pwsh
 
+
+      # Build Dependencies
       - name: Build on Windows
-        if: ${{ !cancelled() && (env.DO_BUILD == 'true' || steps.cache-load.outputs.cache-hit != 'true') && inputs.os == 'windows-latest' }}
+        if: inputs.os == 'windows-latest'
         working-directory: ${{ github.workspace }}
         run: |
             choco install strawberryperl
             .\build_release_vs.bat deps
+            .\build_release_vs.bat pack
+            cd ${{ github.workspace }}/deps/build
 
-      # Windows and Linux don't need to delete any directories, because they only package up deps/build/OrcaSlicer_dep.
-      # But Mac has multiple and we're preserving their directory structure relationship.
-      # So the garbage siblings of OrcaSlicer_dep can be deleted to save artifact and cache space.
       - name: Build on Mac ${{ inputs.arch }}
-        if: ${{ !cancelled() && (env.DO_BUILD == 'true' || steps.cache-load.outputs.cache-hit != 'true') && inputs.os == 'macos-14' }}
+        if: inputs.os == 'macos-14'
         working-directory: ${{ github.workspace }}
         run: |
             brew install automake texinfo libtool
@@ -85,47 +87,53 @@ jobs:
             done
             brew install zstd
 
+
       - name: Apt-Install Dependencies
-        if: ${{ !cancelled() && (env.DO_BUILD == 'true' || steps.cache-load.outputs.cache-hit != 'true') && inputs.os == 'ubuntu-24.04' }}
+        if: inputs.os == 'ubuntu-24.04'
         uses: ./.github/actions/apt-install-deps
 
       - name: Build on Ubuntu
-        if: ${{ !cancelled() && (env.DO_BUILD == 'true' || steps.cache-load.outputs.cache-hit != 'true') && (inputs.os == 'ubuntu-20.04' || inputs.os == 'ubuntu-24.04') }}
+        if: inputs.os == 'ubuntu-20.04' || inputs.os == 'ubuntu-24.04'
         working-directory: ${{ github.workspace }}
         run: |
+            mkdir -p ${{ github.workspace }}/deps/build/destdir
             ./build_linux.sh -dr
+            cd deps/build
+            tar -czvf OrcaSlicer_dep_ubuntu_$(date +"%Y%m%d").tar.gz destdir
 
-      - name: Pack dependencies
-        if: ${{ !cancelled() && ! env.ACT}}
-        working-directory: ${{ github.workspace }}
-        shell: bash
-        run: |
-          tar -cf deps_packet.tar -C ${{ env.DEPS_PATH }} .
 
-      - name: Upload OrcaSlicer_dep director(ies) for use later
-        if: ${{ !cancelled() && ! env.ACT}}
+      # Upload Artifacts
+      # - name: Upload Mac ${{ inputs.arch }} artifacts
+      #   if: inputs.os == 'macos-14'
+      #   uses: actions/upload-artifact@v6
+      #   with:
+      #     name: OrcaSlicer_dep_mac_${{ env.date }}
+      #     path: ${{ github.workspace }}/deps/build/OrcaSlicer_dep*.tar.gz
+
+      - name: Upload Windows artifacts
+        if: inputs.os == 'windows-latest'
         uses: actions/upload-artifact@v6
         with:
-          name: ${{ env.ARTIFACT_NAME }}
-          path: deps_packet.tar
-          retention-days: 10 # It's not too big, but we don't need it for a very long time.
-          if-no-files-found: error
+          name: OrcaSlicer_dep_win64_${{ env.date }}
+          path: ${{ github.workspace }}/deps/build/OrcaSlicer_dep*.zip
 
-      - name: Save cache from main branch
-        if: ${{ !cancelled() && github.ref == 'refs/heads/main' && steps.cache-load.outputs.cache-hit != 'true' }}
-        uses: actions/cache/save@v5
+      - name: Upload Ubuntu artifacts
+        if: ${{ ! env.ACT && inputs.os == 'ubuntu-20.04' || inputs.os == 'ubuntu-24.04' }}
+        env:
+          ubuntu-ver: ${{ (inputs.os == 'ubuntu-20.04' && '2004') || (inputs.os == 'ubuntu-24.04' && '2404') || '' }}
+        uses: actions/upload-artifact@v6
         with:
-          path: ${{ env.DEPS_PATH }}
-          key: ${{ steps.cache-load.outputs.cache-primary-key }}
+          name: OrcaSlicer_dep_ubuntu_${{ env.ubuntu-ver }}_${{ env.date }}
+          path: ${{ github.workspace }}/deps/build/OrcaSlicer_dep_ubuntu_*.tar.gz
 
   build_orca:
     name: Build OrcaSlicer
     needs: [build_deps]
-    if: ${{ !cancelled() && (!inputs.build-deps-only || inputs.force-build) }}
+    if: ${{ !cancelled() && !inputs.build-deps-only && (inputs.force-build || (inputs.valid-cache == true && needs.build_deps.result == 'skipped') || (inputs.valid-cache != true && success())) }}
     uses: ./.github/workflows/build_orca.yml
     with:
-      artifact-name: ${{ needs.build_deps.outputs.artifact-name }}
-      artifact-path: ${{ needs.build_deps.outputs.artifact-path }}
+      cache-key: ${{ inputs.cache-key }}
+      cache-path: ${{ inputs.cache-path }}
       os: ${{ inputs.os }}
       arch: ${{ inputs.arch }}
     secrets: inherit

.github/workflows/build_orca.yml

@@ -1,10 +1,10 @@
 on:
     workflow_call:
       inputs:
-        artifact-name:
+        cache-key:
           required: true
           type: string
-        artifact-path:
+        cache-path:
           required: true
           type: string
         os:
@@ -30,23 +30,12 @@ jobs:
         with:
           lfs: 'true'
 
-      - name: Download deps artifacts
-        uses: actions/download-artifact@v7
+      - name: load cached deps
+        uses: actions/cache@v5
         with:
-          name: ${{ inputs.artifact-name }}
-          path: .
-
-      - name: Unpack dependencies
-        shell: bash
-        run: |
-          if [ ! -f deps_packet.tar ]; then
-            echo "Error: deps_packet.tar not found"
-            ls -R
-            exit 1
-          fi
-          mkdir -p ${{ inputs.artifact-path }}
-          tar -xf deps_packet.tar -C ${{ inputs.artifact-path }}
-          rm deps_packet.tar
+          path: ${{ inputs.cache-path }}
+          key: ${{ inputs.cache-key }}
+          fail-on-cache-miss: true
 
       - uses: lukka/get-cmake@latest
         with:

build_linux.sh

@@ -21,7 +21,7 @@ function usage() {
     echo "   -p: boost ccache hit rate by disabling precompiled headers (default: ON)"
     echo "   -r: skip RAM and disk checks (low RAM compiling)"
     echo "   -s: build the Orca Slicer (optional)"
-    echo "   -t: build tests (optional)"
+    echo "   -t: build tests (optional), requires -s flag"
     echo "   -u: install system dependencies (asks for sudo password; build prerequisite)"
     echo "   -l: use Clang instead of GCC (default: GCC)"
     echo "   -L: use ld.lld as linker (if available)"