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:15:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

upgrade to macos 13 (#3289)

Browse Source 
brew uninstall --ignore-dependencies zstd
Use local curl
remove brew/macport dependency
This commit is contained in:
SoftFever 2023-12-26 19:39:24 +08:00
parent de8013f211
commit 63351c01da
6 changed files with 31 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,9 +46,9 @@ jobs:
include: include:
- os: ubuntu-20.04 - os: ubuntu-20.04
- os: windows-latest - os: windows-latest
- os: macos-12 - os: macos-13
arch: x86_64 arch: x86_64
- os: macos-12 - os: macos-13
arch: arm64 arch: arm64
uses: ./.github/workflows/build_check_cache.yml uses: ./.github/workflows/build_check_cache.yml
with: with:

6
.github/workflows/build_check_cache.yml vendored
View File

@ -28,9 +28,9 @@ jobs:
- name: set outputs - name: set outputs
id: set_outputs id: set_outputs
env: env:
underscore-arch: ${{ inputs.os == 'macos-12' && '_' || ''}}${{ inputs.os == 'macos-12' && inputs.arch || '' }} # if is macos, make a string that does "_{arch}", else output nothing underscore-arch: ${{ inputs.os == 'macos-13' && '_' || ''}}${{ inputs.os == 'macos-13' && inputs.arch || '' }} # if is macos, make a string that does "_{arch}", else output nothing
dash-arch: ${{ inputs.os == 'macos-12' && '-' || ''}}${{ inputs.os == 'macos-12' && inputs.arch || '' }} # if is macos, make a string that does "-{arch}", else output nothing dash-arch: ${{ inputs.os == 'macos-13' && '-' || ''}}${{ inputs.os == 'macos-13' && inputs.arch || '' }} # if is macos, make a string that does "-{arch}", else output nothing
dep-folder-name: ${{ (inputs.os == 'windows-latest' || inputs.os == 'macos-12') && 'OrcaSlicer_dep' || 'destdir' }} dep-folder-name: ${{ (inputs.os == 'windows-latest' || inputs.os == 'macos-13') && 'OrcaSlicer_dep' || 'destdir' }}
output-cmd: ${{ inputs.os == 'windows-latest' && '$env:GITHUB_OUTPUT' || '"$GITHUB_OUTPUT"'}} output-cmd: ${{ inputs.os == 'windows-latest' && '$env:GITHUB_OUTPUT' || '"$GITHUB_OUTPUT"'}}
run: | run: |
echo cache-key=${{ runner.os }}${{ env.dash-arch }}-cache-orcaslicer_deps-build-${{ hashFiles('deps/**') }} >> ${{ env.output-cmd }} echo cache-key=${{ runner.os }}${{ env.dash-arch }}-cache-orcaslicer_deps-build-${{ hashFiles('deps/**') }} >> ${{ env.output-cmd }}

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

@ -67,10 +67,11 @@ jobs:
cd ${{ github.workspace }}/deps/build cd ${{ github.workspace }}/deps/build
- name: Build on Mac ${{ inputs.arch }} - name: Build on Mac ${{ inputs.arch }}
if: inputs.os == 'macos-12' if: inputs.os == 'macos-13'
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 }}
@ -97,7 +98,7 @@ jobs:
# Upload Artifacts # Upload Artifacts
- name: Upload Mac ${{ inputs.arch }} artifacts - name: Upload Mac ${{ inputs.arch }} artifacts
if: inputs.os == 'macos-12' if: inputs.os == 'macos-13'
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3
with: with:
name: OrcaSlicer_dep_mac_${{ inputs.arch }}_${{ env.date }} name: OrcaSlicer_dep_mac_${{ inputs.arch }}_${{ env.date }}

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

@ -74,21 +74,24 @@ jobs:
# Mac # Mac
- name: Install tools mac - name: Install tools mac
if: inputs.os == 'macos-12' if: inputs.os == 'macos-13'
run: | run: |
brew install cmake git gettext zstd tree 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}}
mkdir -p ${{ github.workspace }}/deps/build_${{inputs.arch}}/OrcaSlicer_dep_${{inputs.arch}} mkdir -p ${{ github.workspace }}/deps/build_${{inputs.arch}}/OrcaSlicer_dep_${{inputs.arch}}
tree ${{ github.workspace }}/deps/build_${{inputs.arch}}/OrcaSlicer_dep_${{inputs.arch}}
- name: Build slicer mac - name: Build slicer mac
if: inputs.os == 'macos-12' if: inputs.os == 'macos-13'
working-directory: ${{ github.workspace }} working-directory: ${{ github.workspace }}
run: | run: |
./build_release_macos.sh -s -n -a ${{inputs.arch}} ./build_release_macos.sh -s -n -a ${{inputs.arch}}
# Thanks to RaySajuuk, it's working now # Thanks to RaySajuuk, it's working now
- name: Sign app and notary - name: Sign app and notary
if: (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/')) && inputs.os == 'macos-12' if: (github.ref == 'refs/heads/main' || startsWith(github.ref, 'refs/heads/release/')) && inputs.os == 'macos-13'
working-directory: ${{ github.workspace }} working-directory: ${{ github.workspace }}
env: env:
BUILD_CERTIFICATE_BASE64: ${{ secrets.BUILD_CERTIFICATE_BASE64 }} BUILD_CERTIFICATE_BASE64: ${{ secrets.BUILD_CERTIFICATE_BASE64 }}
@ -114,14 +117,14 @@ jobs:
xcrun stapler staple OrcaSlicer_Mac_${{inputs.arch}}_${{ env.ver }}.dmg xcrun stapler staple OrcaSlicer_Mac_${{inputs.arch}}_${{ env.ver }}.dmg
- name: Create DMG without notary - name: Create DMG without notary
if: github.ref != 'refs/heads/main' && inputs.os == 'macos-12' if: github.ref != 'refs/heads/main' && inputs.os == 'macos-13'
working-directory: ${{ github.workspace }} working-directory: ${{ github.workspace }}
run: | run: |
ln -s /Applications ${{ github.workspace }}/build_${{inputs.arch}}/OrcaSlicer/Applications ln -s /Applications ${{ github.workspace }}/build_${{inputs.arch}}/OrcaSlicer/Applications
hdiutil create -volname "OrcaSlicer" -srcfolder ${{ github.workspace }}/build_${{inputs.arch}}/OrcaSlicer -ov -format UDZO OrcaSlicer_Mac_${{inputs.arch}}_${{ env.ver }}.dmg hdiutil create -volname "OrcaSlicer" -srcfolder ${{ github.workspace }}/build_${{inputs.arch}}/OrcaSlicer -ov -format UDZO OrcaSlicer_Mac_${{inputs.arch}}_${{ env.ver }}.dmg
- name: Upload artifacts mac - name: Upload artifacts mac
if: inputs.os == 'macos-12' if: inputs.os == 'macos-13'
uses: actions/upload-artifact@v3 uses: actions/upload-artifact@v3
with: with:
name: OrcaSlicer_Mac_${{inputs.arch}}_${{ env.ver }} name: OrcaSlicer_Mac_${{inputs.arch}}_${{ env.ver }}

5
CMakeLists.txt
View File

@ -436,11 +436,8 @@ find_package(TBB REQUIRED)
# add_definitions(-DTBB_USE_CAPTURED_EXCEPTION=0) # add_definitions(-DTBB_USE_CAPTURED_EXCEPTION=0)
find_package(OpenSSL REQUIRED) find_package(OpenSSL REQUIRED)
if (APPLE)
find_package(CURL CONFIG REQUIRED)
else()
find_package(CURL REQUIRED) find_package(CURL REQUIRED)
endif()
add_library(libcurl INTERFACE) add_library(libcurl INTERFACE)
target_link_libraries(libcurl INTERFACE CURL::libcurl) target_link_libraries(libcurl INTERFACE CURL::libcurl)

25
build_release_macos.sh
View File

@ -35,18 +35,19 @@ fi
echo "Arch: $ARCH" echo "Arch: $ARCH"
echo "BUILD_TARGET: $BUILD_TARGET" echo "BUILD_TARGET: $BUILD_TARGET"
if which -s brew; then # if which -s brew; then
brew --prefix libiconv # brew --prefix libiconv
brew --prefix zstd # brew --prefix zstd
export LIBRARY_PATH=$LIBRARY_PATH:$(brew --prefix zstd)/lib/ # export LIBRARY_PATH=$LIBRARY_PATH:$(brew --prefix zstd)/lib/
elif which -s port; then # elif which -s port; then
port install libiconv # port install libiconv
port install zstd # port install zstd
export LIBRARY_PATH=$LIBRARY_PATH:/opt/local/lib # export LIBRARY_PATH=$LIBRARY_PATH:/opt/local/lib
else # else
echo "Need either brew or macports to successfully build deps" # echo "Need either brew or macports to successfully build deps"
exit 1 # exit 1
fi # fi
WD="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" WD="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
cd $WD/deps cd $WD/deps