mirror of
https://github.com/SoftFever/OrcaSlicer.git
synced 2025-10-30 20:21:12 -06:00
SoftFever
GitHub
parent
9dd3fb60b7
commit
6962cd6577
7 changed files with 63 additions and 40 deletions
11
.github/workflows/build_deps.yml
vendored
11
.github/workflows/build_deps.yml
vendored
|
|
@ -61,13 +61,14 @@ jobs:
|
|||
mkdir ${{ github.workspace }}/deps/build
|
||||
mkdir ${{ github.workspace }}/deps/build/OrcaSlicer_dep
|
||||
.\build_release_vs2022.bat deps
|
||||
.\build_release_vs2022.bat pack
|
||||
cd ${{ github.workspace }}/deps/build
|
||||
|
||||
- name: Build on Mac x86_64
|
||||
if: matrix.os == 'macos-12' && matrix.arch == 'x86_64'
|
||||
working-directory: ${{ github.workspace }}
|
||||
run: |
|
||||
brew install cmake git gettext
|
||||
brew install cmake git gettext automake
|
||||
mkdir -p ${{ github.workspace }}/deps/build_x86_64
|
||||
mkdir -p ${{ github.workspace }}/deps/build_x86_64/OrcaSlicer_dep_x86_64
|
||||
./build_release_macos.sh -dp -a x86_64
|
||||
|
|
@ -76,7 +77,7 @@ jobs:
|
|||
if: matrix.os == 'macos-12' && matrix.arch == 'arm64'
|
||||
working-directory: ${{ github.workspace }}
|
||||
run: |
|
||||
brew install cmake git gettext
|
||||
brew install cmake git gettext automake
|
||||
mkdir -p ${{ github.workspace }}/deps/build_arm64
|
||||
mkdir -p ${{ github.workspace }}/deps/build_arm64/OrcaSlicer_dep_arm64
|
||||
./build_release_macos.sh -dp -a arm64
|
||||
|
|
@ -96,6 +97,8 @@ jobs:
|
|||
sudo ./BuildLinux.sh -ur
|
||||
sudo chown $USER -R ./
|
||||
./BuildLinux.sh -dr
|
||||
cd deps/build
|
||||
tar -czvf OrcaSlicer_dep_ubuntu_$(date +"%Y%m%d").tar.gz destdir
|
||||
|
||||
- name: Upload Mac arm64 artifacts
|
||||
if: matrix.os == 'macos-12' && matrix.arch == 'arm64'
|
||||
|
|
@ -116,12 +119,12 @@ jobs:
|
|||
uses: actions/upload-artifact@v3
|
||||
with:
|
||||
name: OrcaSlicer_dep_win64_${{ env.date }}
|
||||
path: ${{ github.workspace }}/deps/build/OrcaSlicer_dep
|
||||
path: ${{ github.workspace }}/deps/build/OrcaSlicer_dep*.zip
|
||||
|
||||
- name: Upload Ubuntu artifacts
|
||||
if: matrix.os == 'ubuntu-20.04'
|
||||
uses: actions/upload-artifact@v3
|
||||
with:
|
||||
name: OrcaSlicer_dep_ubuntu_${{ env.date }}
|
||||
path: ${{ github.workspace }}/deps/build/destdir
|
||||
path: ${{ github.workspace }}/deps/build/OrcaSlicer_dep_ubuntu_*.tar.gz
|
||||
|
||||
52
.github/workflows/build_orca.yml
vendored
52
.github/workflows/build_orca.yml
vendored
|
|
@ -32,7 +32,7 @@ jobs:
|
|||
matrix:
|
||||
include:
|
||||
- os: ubuntu-20.04
|
||||
- os: windows-2019
|
||||
- os: windows-latest
|
||||
- os: macos-12
|
||||
arch: x86_64
|
||||
- os: macos-12
|
||||
|
|
@ -44,7 +44,7 @@ jobs:
|
|||
uses: actions/checkout@v3
|
||||
|
||||
- name: Get the version and date on Ubuntu and macOS
|
||||
if: matrix.os != 'windows-2019'
|
||||
if: matrix.os != 'windows-latest'
|
||||
id: get-version-unix
|
||||
run: |
|
||||
ver=$(grep 'set(SoftFever_VERSION' version.inc | cut -d '"' -f2)
|
||||
|
|
@ -53,7 +53,7 @@ jobs:
|
|||
shell: bash
|
||||
|
||||
- name: Get the version and date on Windows
|
||||
if: matrix.os == 'windows-2019'
|
||||
if: matrix.os == 'windows-latest'
|
||||
id: get-version-windows
|
||||
run: |
|
||||
echo "date=$(Get-Date -Format 'yyyyMMdd')" | Out-File -Append -FilePath $env:GITHUB_ENV -Encoding utf8
|
||||
|
|
@ -70,7 +70,7 @@ jobs:
|
|||
- name: Install tools mac
|
||||
if: matrix.os == 'macos-12'
|
||||
run: |
|
||||
brew install cmake git gettext zstd
|
||||
brew install cmake git gettext zstd tree
|
||||
mkdir -p ${{ github.workspace }}/deps/build_${{matrix.arch}}
|
||||
mkdir -p ${{ github.workspace }}/deps/build_${{matrix.arch}}/OrcaSlicer_dep_${{matrix.arch}}
|
||||
|
||||
|
|
@ -93,11 +93,11 @@ jobs:
|
|||
if: matrix.os == 'macos-12'
|
||||
working-directory: ${{ github.workspace }}
|
||||
run: |
|
||||
curl -LJO https://github.com/SoftFever/FileSharing/releases/download/2023.08.2/OrcaSlicer_dep_mac_${{matrix.arch}}_06-08-2023.tar.gz
|
||||
tar -zxfOrcaSlicer_dep_mac_${{matrix.arch}}_06-08-2023.tar.gz -C ${{ github.workspace }}/deps/build_${{matrix.arch}}
|
||||
chown -R $(id -u):$(id -g) ${{ github.workspace }}/deps/build_${{matrix.arch}}/OrcaSlicer_dep_${{matrix.arch}}
|
||||
ls -l ${{ github.workspace }}/deps/build_${{matrix.arch}}/OrcaSlicer_dep_${{matrix.arch}}
|
||||
rm OrcaSlicer_dep_mac_${{matrix.arch}}_06-08-2023.tar.gz
|
||||
curl -LJO https://github.com/SoftFever/OrcaSlicer_deps/releases/download/OrcaSlicer_deps_Oct2023/OrcaSlicer_dep_mac_${{matrix.arch}}_20231008.tar.gz
|
||||
tar -zvxf ./OrcaSlicer_dep_mac_${{matrix.arch}}_20231008.tar.gz -C ${{ github.workspace }}/deps/build_${{matrix.arch}}
|
||||
chown -R $(id -u):$(id -g) ${{ github.workspace }}/deps/build_${{matrix.arch}}
|
||||
tree ${{ github.workspace }}/deps/build_${{matrix.arch}}
|
||||
rm ./OrcaSlicer_dep_mac_${{matrix.arch}}_20231008.tar.gz
|
||||
|
||||
|
||||
- name: Build slicer mac
|
||||
|
|
@ -149,34 +149,34 @@ jobs:
|
|||
|
||||
# Windows
|
||||
- name: setup MSVC
|
||||
if: matrix.os == 'windows-2019'
|
||||
if: matrix.os == 'windows-latest'
|
||||
uses: microsoft/setup-msbuild@v1.1
|
||||
|
||||
- name: Install nsis
|
||||
if: matrix.os == 'windows-2019'
|
||||
if: matrix.os == 'windows-latest'
|
||||
run: |
|
||||
choco install nsis
|
||||
|
||||
- name: download deps
|
||||
if: matrix.os == 'windows-2019'
|
||||
if: matrix.os == 'windows-latest'
|
||||
shell: powershell
|
||||
run: '(new-object System.Net.WebClient).DownloadFile("https://github.com/SoftFever/FileSharing/releases/download/4/OrcaSlicer_dep_18Jul2023.zip", "$env:temp\OrcaSlicer_dep_18Jul2023.zip")'
|
||||
run: '(new-object System.Net.WebClient).DownloadFile("https://github.com/SoftFever/OrcaSlicer_deps/releases/download/OrcaSlicer_deps_Oct2023/OrcaSlicer_dep_win64_20230810_vs2022.zip", "$env:temp\OrcaSlicer_dep_win64_20230810_vs2022.zip")'
|
||||
|
||||
- name: maker dir
|
||||
if: matrix.os == 'windows-2019'
|
||||
if: matrix.os == 'windows-latest'
|
||||
working-directory: ${{ github.workspace }}
|
||||
run: |
|
||||
mkdir ${{ github.workspace }}/deps/build
|
||||
mkdir ${{ github.workspace }}/deps/build/OrcaSlicer_dep
|
||||
|
||||
- name: extract deps
|
||||
if: matrix.os == 'windows-2019'
|
||||
if: matrix.os == 'windows-latest'
|
||||
working-directory: ${{ github.workspace }}/deps/build
|
||||
shell: cmd
|
||||
run: '"C:/Program Files/7-Zip/7z.exe" x %temp%\OrcaSlicer_dep_18Jul2023.zip'
|
||||
run: '"C:/Program Files/7-Zip/7z.exe" x %temp%\OrcaSlicer_dep_win64_20230810_vs2022.zip'
|
||||
|
||||
# - name: build deps
|
||||
# if: matrix.os == 'windows-2019'
|
||||
# if: matrix.os == 'windows-latest'
|
||||
# id: cache_deps
|
||||
# uses: actions/cache@v3
|
||||
# env:
|
||||
|
|
@ -194,31 +194,31 @@ jobs:
|
|||
# - run: Get-ChildItem ${{ github.workspace }}/deps/build/ -Exclude OrcaSlicer_dep | Remove-Item -Recurse -Force
|
||||
|
||||
- name: Build slicer Win
|
||||
if: matrix.os == 'windows-2019'
|
||||
if: matrix.os == 'windows-latest'
|
||||
working-directory: ${{ github.workspace }}
|
||||
run: .\build_release.bat slicer
|
||||
run: .\build_release_vs2022.bat slicer
|
||||
|
||||
- name: Create installer Win
|
||||
if: matrix.os == 'windows-2019'
|
||||
if: matrix.os == 'windows-latest'
|
||||
working-directory: ${{ github.workspace }}/build
|
||||
run: |
|
||||
cpack -G NSIS
|
||||
|
||||
# - name: pack app
|
||||
# if: matrix.os == 'windows-2019'
|
||||
# if: matrix.os == 'windows-latest'
|
||||
# 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 zip
|
||||
if: matrix.os == 'windows-2019'
|
||||
if: matrix.os == 'windows-latest'
|
||||
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'
|
||||
if: matrix.os == 'windows-latest'
|
||||
uses: actions/upload-artifact@v3
|
||||
with:
|
||||
name: OrcaSlicer_Windows_V${{ env.ver }}
|
||||
|
|
@ -265,11 +265,11 @@ jobs:
|
|||
run: |
|
||||
mkdir -p ${{ github.workspace }}/deps/build
|
||||
mkdir -p ${{ github.workspace }}/deps/build/destdir
|
||||
curl -LJO https://github.com/SoftFever/FileSharing/releases/download/2023.08/OrcaSlicer_dep_ubuntu_02-08-2023.tar.gz
|
||||
tar -zxf OrcaSlicer_dep_ubuntu_02-08-2023.tar.gz -C ${{ github.workspace }}/deps/build
|
||||
curl -LJO https://github.com/SoftFever/OrcaSlicer_deps/releases/download/OrcaSlicer_deps_Oct2023/OrcaSlicer_dep_ubuntu_20231008.zip
|
||||
unzip ./OrcaSlicer_dep_ubuntu_20231008.zip -d ${{ github.workspace }}/deps/build/destdir
|
||||
chown -R $(id -u):$(id -g) ${{ github.workspace }}/deps/build/destdir
|
||||
ls -l ${{ github.workspace }}/deps/build/destdir
|
||||
rm OrcaSlicer_dep_ubuntu_02-08-2023.tar.gz
|
||||
rm OrcaSlicer_dep_ubuntu_20231008.zip
|
||||
|
||||
|
||||
- name: Build slicer
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue