Merge branch 'main' into dev/p2s-pr

This commit is contained in:
Noisyfox 2025-11-01 20:29:55 +08:00 committed by GitHub
commit ffddfb0559
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
9 changed files with 22 additions and 61 deletions

View file

@ -54,7 +54,7 @@ jobs:
strategy:
fail-fast: false
# Don't run scheduled builds on forks:
if: github.event_name != 'schedule' || github.repository == 'SoftFever/OrcaSlicer'
if: !cancelled() && (github.event_name != 'schedule' || github.repository == 'SoftFever/OrcaSlicer')
uses: ./.github/workflows/build_check_cache.yml
with:
os: ubuntu-24.04
@ -70,7 +70,7 @@ jobs:
- os: macos-14
arch: arm64
# Don't run scheduled builds on forks:
if: github.event_name != 'schedule' || github.repository == 'SoftFever/OrcaSlicer'
if: !cancelled() && (github.event_name != 'schedule' || github.repository == 'SoftFever/OrcaSlicer')
uses: ./.github/workflows/build_check_cache.yml
with:
os: ${{ matrix.os }}
@ -82,7 +82,7 @@ jobs:
name: Unit Tests
runs-on: ubuntu-24.04
needs: build_linux
if: ${{ success() }}
if: ${{ !cancelled() && success() }}
steps:
- name: Checkout
uses: actions/checkout@v5
@ -134,7 +134,7 @@ jobs:
- arch: aarch64
runner: ubuntu-24.04-arm
# Don't run scheduled builds on forks:
if: github.event_name != 'schedule' || github.repository == 'SoftFever/OrcaSlicer'
if: !cancelled() && (github.event_name != 'schedule' || github.repository == 'SoftFever/OrcaSlicer')
runs-on: ${{ matrix.variant.runner }}
env:
date:

View file

@ -26,7 +26,7 @@ on:
jobs:
build_deps:
name: Build Deps
if: inputs.build-deps-only || inputs.force-build || inputs.valid-cache != true
if: !cancelled() && (inputs.build-deps-only || inputs.force-build || inputs.valid-cache != true)
runs-on: ${{ inputs.os }}
env:
date: