mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2026-03-18 01:12:20 -06:00
Merge branch 'main' into dev/p2s-pr
This commit is contained in:
commit
50d93afc25
3 changed files with 2 additions and 13 deletions
4
.github/workflows/build_all.yml
vendored
4
.github/workflows/build_all.yml
vendored
|
|
@ -30,9 +30,6 @@ on:
|
|||
- 'build_release_macos.sh'
|
||||
- 'scripts/flatpak/**'
|
||||
|
||||
schedule:
|
||||
- cron: '35 7 * * *' # run once a day near midnight US Pacific time
|
||||
|
||||
workflow_dispatch: # allows for manual dispatch
|
||||
inputs:
|
||||
build-deps-only:
|
||||
|
|
@ -63,7 +60,6 @@ jobs:
|
|||
os: ${{ matrix.os }}
|
||||
arch: ${{ matrix.arch }}
|
||||
build-deps-only: ${{ inputs.build-deps-only || false }}
|
||||
force-build: ${{ github.event_name == 'schedule' }}
|
||||
secrets: inherit
|
||||
flatpak:
|
||||
name: "Flatpak"
|
||||
|
|
|
|||
4
.github/workflows/build_check_cache.yml
vendored
4
.github/workflows/build_check_cache.yml
vendored
|
|
@ -12,9 +12,6 @@ on:
|
|||
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
|
||||
|
|
@ -58,5 +55,4 @@ jobs:
|
|||
os: ${{ inputs.os }}
|
||||
arch: ${{ inputs.arch }}
|
||||
build-deps-only: ${{ inputs.build-deps-only }}
|
||||
force-build: ${{ inputs.force-build }}
|
||||
secrets: inherit
|
||||
|
|
|
|||
7
.github/workflows/build_deps.yml
vendored
7
.github/workflows/build_deps.yml
vendored
|
|
@ -19,14 +19,11 @@ on:
|
|||
build-deps-only:
|
||||
required: false
|
||||
type: boolean
|
||||
force-build:
|
||||
required: false
|
||||
type: boolean
|
||||
|
||||
jobs:
|
||||
build_deps:
|
||||
name: Build Deps
|
||||
if: inputs.build-deps-only || inputs.force-build || inputs.valid-cache != true
|
||||
if: inputs.build-deps-only || inputs.valid-cache != true
|
||||
runs-on: ${{ inputs.os }}
|
||||
env:
|
||||
date:
|
||||
|
|
@ -142,7 +139,7 @@ jobs:
|
|||
build_orca:
|
||||
name: Build OrcaSlicer
|
||||
needs: [build_deps]
|
||||
if: ${{ !cancelled() && !inputs.build-deps-only && inputs.force-build || (inputs.valid-cache == true && needs.build_deps.result == 'skipped') || (inputs.valid-cache != true && success()) }}
|
||||
if: ${{ !cancelled() && !inputs.build-deps-only && (inputs.valid-cache == true && needs.build_deps.result == 'skipped') || (inputs.valid-cache != true && success()) }}
|
||||
uses: ./.github/workflows/build_orca.yml
|
||||
with:
|
||||
cache-key: ${{ inputs.cache-key }}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue