mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2026-02-17 18:02:20 -07:00
some misc changes (#1848)
* some misc changes * stealth_mode: disable hms * fix bbl camera #1091 #1830 * fix anker
This commit is contained in:
parent
a202fde769
commit
6e1bdaf9d4
49 changed files with 360 additions and 296 deletions
32
.github/workflows/build_deps.yml
vendored
32
.github/workflows/build_deps.yml
vendored
|
|
@ -15,18 +15,22 @@ on:
|
|||
- 'deps/**'
|
||||
- .github/workflows/build_deps.yml
|
||||
|
||||
concurrency:
|
||||
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
|
||||
cancel-in-progress: true
|
||||
|
||||
jobs:
|
||||
build_deps:
|
||||
strategy:
|
||||
fail-fast: false
|
||||
matrix:
|
||||
include:
|
||||
- os: ubuntu-22.04
|
||||
- os: windows-2019
|
||||
- os: macos-12
|
||||
arch: x86_64
|
||||
- os: macos-12
|
||||
arch: arm64
|
||||
# - os: ubuntu-22.04
|
||||
- os: windows-latest
|
||||
# - os: macos-12
|
||||
# arch: x86_64
|
||||
# - os: macos-12
|
||||
# arch: arm64
|
||||
runs-on: ${{ matrix.os }}
|
||||
|
||||
steps:
|
||||
|
|
@ -35,31 +39,29 @@ jobs:
|
|||
|
||||
- name: setup dev on Windows
|
||||
if: matrix.os == 'Windows'
|
||||
uses: ilammy/msvc-dev-cmd@v1
|
||||
uses: microsoft/setup-msbuild@v1.1
|
||||
|
||||
- name: Get the date on Ubuntu and macOS
|
||||
if: matrix.os != 'windows-2019'
|
||||
if: matrix.os != 'windows-latest'
|
||||
id: get-date-unix
|
||||
run: echo "date=$(date +'%Y%m%d')" >> $GITHUB_ENV
|
||||
shell: bash
|
||||
|
||||
- name: Get the date on Windows
|
||||
if: matrix.os == 'windows-2019'
|
||||
if: matrix.os == 'windows-latest'
|
||||
id: get-date-windows
|
||||
run: echo "date=$(Get-Date -Format 'yyyyMMdd')" | Out-File -Append -FilePath $env:GITHUB_ENV -Encoding utf8
|
||||
shell: pwsh
|
||||
|
||||
- name: Build on Windows
|
||||
if: matrix.os == 'windows-2019'
|
||||
if: matrix.os == 'windows-latest'
|
||||
working-directory: ${{ github.workspace }}
|
||||
run: |
|
||||
choco install strawberryperl
|
||||
mkdir ${{ github.workspace }}/deps/build
|
||||
mkdir ${{ github.workspace }}/deps/build/OrcaSlicer_dep
|
||||
.\build_release.bat deps
|
||||
.\build_release_vs2022.bat deps
|
||||
cd ${{ github.workspace }}/deps/build
|
||||
'"C:/Program Files/7-Zip/7z.exe" a OrcaSlicer_dep_win64_${{ env.date }}.zip ${{ github.workspace }}/deps/build/OrcaSlicer_dep'
|
||||
ls
|
||||
|
||||
- name: Build on Mac x86_64
|
||||
if: matrix.os == 'macos-12' && matrix.arch == 'x86_64'
|
||||
|
|
@ -110,11 +112,11 @@ jobs:
|
|||
path: ${{ github.workspace }}/deps/build_x86_64/OrcaSlicer_dep*.tar.gz
|
||||
|
||||
- name: Upload Windows artifacts
|
||||
if: matrix.os == 'windows-2019'
|
||||
if: matrix.os == 'windows-latest'
|
||||
uses: actions/upload-artifact@v3
|
||||
with:
|
||||
name: OrcaSlicer_dep_win64_${{ env.date }}
|
||||
path: ${{ github.workspace }}/deps/build/*.zip
|
||||
path: ${{ github.workspace }}/deps/build/OrcaSlicer_dep
|
||||
|
||||
- name: Upload Ubuntu artifacts
|
||||
if: matrix.os == 'ubuntu-22.04'
|
||||
|
|
|
|||
31
.github/workflows/build_orca.yml
vendored
31
.github/workflows/build_orca.yml
vendored
|
|
@ -22,7 +22,11 @@ on:
|
|||
- 'localization/**'
|
||||
- 'resources/**'
|
||||
- ".github/workflows/build_orca.yml"
|
||||
|
||||
|
||||
concurrency:
|
||||
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
|
||||
cancel-in-progress: true
|
||||
|
||||
jobs:
|
||||
build_orca:
|
||||
strategy:
|
||||
|
|
@ -146,12 +150,12 @@ jobs:
|
|||
# Windows
|
||||
- name: setup MSVC
|
||||
if: matrix.os == 'windows-2019'
|
||||
uses: ilammy/msvc-dev-cmd@v1
|
||||
uses: microsoft/setup-msbuild@v1.1
|
||||
|
||||
- name: Install perl
|
||||
- name: Install nsis
|
||||
if: matrix.os == 'windows-2019'
|
||||
run: |
|
||||
choco install strawberryperl
|
||||
choco install nsis
|
||||
|
||||
- name: download deps
|
||||
if: matrix.os == 'windows-2019'
|
||||
|
|
@ -185,7 +189,7 @@ jobs:
|
|||
# name: build deps
|
||||
# working-directory: ${{ github.workspace }}
|
||||
# continue-on-error: true
|
||||
# run: .\build_release.bat deps
|
||||
# run: .\build_release_vs2022.bat deps
|
||||
|
||||
# - run: Get-ChildItem ${{ github.workspace }}/deps/build/ -Exclude OrcaSlicer_dep | Remove-Item -Recurse -Force
|
||||
|
||||
|
|
@ -194,19 +198,30 @@ jobs:
|
|||
working-directory: ${{ github.workspace }}
|
||||
run: .\build_release.bat slicer
|
||||
|
||||
- name: Create installer Win
|
||||
if: matrix.os == 'windows-2019'
|
||||
working-directory: ${{ github.workspace }}/build
|
||||
run: cpack -G NSIS
|
||||
|
||||
# - name: pack app
|
||||
# if: matrix.os == 'windows-2019'
|
||||
# working-directory: ${{ github.workspace }}/build
|
||||
# shell: cmd
|
||||
# run: '"C:/Program Files/7-Zip/7z.exe" a -tzip OrcaSlicer_dev_build.zip ${{ github.workspace }}/build/OrcaSlicer'
|
||||
|
||||
- name: Upload artifacts Win
|
||||
- name: Upload artifacts Win zip
|
||||
if: matrix.os == 'windows-2019'
|
||||
uses: actions/upload-artifact@v3
|
||||
with:
|
||||
name: OrcaSlicer_Windows_V${{ env.ver }}_portable
|
||||
path: ${{ github.workspace }}/build/OrcaSlicer
|
||||
|
||||
- name: Upload artifacts Win installer
|
||||
if: matrix.os == 'windows-2019'
|
||||
uses: actions/upload-artifact@v3
|
||||
with:
|
||||
name: OrcaSlicer_Windows_V${{ env.ver }}
|
||||
path: ${{ github.workspace }}/build/OrcaSlicer
|
||||
|
||||
path: ${{ github.workspace }}/build/OrcaSlicer*.exe
|
||||
# Ubuntu
|
||||
|
||||
- name: Install dependencies
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue