Merge branch 'main' into feature/auto-update

This commit is contained in:
SoftFever
2026-01-05 18:09:53 +08:00
5 changed files with 127 additions and 72 deletions

View File

@@ -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: