Skip to content
This repository has been archived by the owner on Sep 23, 2024. It is now read-only.

Commit

Permalink
workaround to solve unwanted zstd dependency on runner (SoftFever#3298)
Browse files Browse the repository at this point in the history
* trigger build

* Remove zstd only for dep build

* reinstall zstd after building completed
  • Loading branch information
SoftFever authored Dec 27, 2023
1 parent fedd2bd commit 485e1cc
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 2 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/build_deps.yml
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,13 @@ jobs:
working-directory: ${{ github.workspace }}
run: |
brew install cmake git gettext automake
brew uninstall --ignore-dependencies zstd
brew list
mkdir -p ${{ github.workspace }}/deps/build_${{ 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 }}
brew install zstd
- name: Build on Ubuntu
if: inputs.os == 'ubuntu-20.04'
Expand Down
1 change: 0 additions & 1 deletion .github/workflows/build_orca.yml
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,6 @@ jobs:
if: inputs.os == 'macos-12'
run: |
brew install cmake git gettext tree
brew uninstall --ignore-dependencies zstd
brew list
mkdir -p ${{ github.workspace }}/deps/build_${{inputs.arch}}
mkdir -p ${{ github.workspace }}/deps/build_${{inputs.arch}}/OrcaSlicer_dep_${{inputs.arch}}
Expand Down
1 change: 1 addition & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ if (APPLE)
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")

message(STATUS "Orca: IS_CROSS_COMPILE: ${IS_CROSS_COMPILE}")
endif ()

# Proposal for C++ unit tests and sandboxes
Expand Down

0 comments on commit 485e1cc

Please sign in to comment.