GitHub-Proxy/OrcaSlicer
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/SoftFever/OrcaSlicer.git synced 2025-08-15 23:06:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

workaround to solve unwanted zstd dependency on runner (#3298)

Browse Source 
* trigger build

* Remove zstd only for dep build

* reinstall zstd after building completed
This commit is contained in:
SoftFever 2023-12-27 15:43:05 +08:00
parent 98d8b010c4
commit 78c7abe4c2
3 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/build_deps.yml vendored
View File

@ -71,11 +71,13 @@ jobs:
working-directory: ${{ github.workspace }} working-directory: ${{ github.workspace }}
run: | run: |
brew install cmake git gettext automake brew install cmake git gettext automake
brew uninstall --ignore-dependencies zstd
brew list brew list
mkdir -p ${{ github.workspace }}/deps/build_${{ inputs.arch }} mkdir -p ${{ github.workspace }}/deps/build_${{ inputs.arch }}
mkdir -p ${{ github.workspace }}/deps/build_${{ inputs.arch }}/OrcaSlicer_dep_${{ inputs.arch }} mkdir -p ${{ github.workspace }}/deps/build_${{ inputs.arch }}/OrcaSlicer_dep_${{ inputs.arch }}
brew uninstall --ignore-dependencies zstd
./build_release_macos.sh -dp -a ${{ inputs.arch }} ./build_release_macos.sh -dp -a ${{ inputs.arch }}
brew install zstd
- name: Build on Ubuntu - name: Build on Ubuntu
if: inputs.os == 'ubuntu-20.04' if: inputs.os == 'ubuntu-20.04'

1
.github/workflows/build_orca.yml vendored
View File

@ -77,7 +77,6 @@ jobs:
if: inputs.os == 'macos-12' if: inputs.os == 'macos-12'
run: | run: |
brew install cmake git gettext tree brew install cmake git gettext tree
brew uninstall --ignore-dependencies zstd
brew list brew list
mkdir -p ${{ github.workspace }}/deps/build_${{inputs.arch}} mkdir -p ${{ github.workspace }}/deps/build_${{inputs.arch}}
mkdir -p ${{ github.workspace }}/deps/build_${{inputs.arch}}/OrcaSlicer_dep_${{inputs.arch}} mkdir -p ${{ github.workspace }}/deps/build_${{inputs.arch}}/OrcaSlicer_dep_${{inputs.arch}}

1
CMakeLists.txt
View File

@ -55,6 +55,7 @@ if (APPLE)
set(CMAKE_OSX_DEPLOYMENT_TARGET "11.3" CACHE STRING "Minimum OS X deployment version" FORCE) set(CMAKE_OSX_DEPLOYMENT_TARGET "11.3" CACHE STRING "Minimum OS X deployment version" FORCE)
SET(CMAKE_XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER "com.softfever3d.orca-slicer") SET(CMAKE_XCODE_ATTRIBUTE_PRODUCT_BUNDLE_IDENTIFIER "com.softfever3d.orca-slicer")
message(STATUS "Orca: IS_CROSS_COMPILE: ${IS_CROSS_COMPILE}")
endif () endif ()
# Proposal for C++ unit tests and sandboxes # Proposal for C++ unit tests and sandboxes