diff --git a/.github/workflows/build_all.yml b/.github/workflows/build_all.yml index a45d336f86c..a6141efff7b 100644 --- a/.github/workflows/build_all.yml +++ b/.github/workflows/build_all.yml @@ -46,9 +46,9 @@ jobs: include: - os: ubuntu-20.04 - os: windows-latest - - os: macos-12 + - os: macos-13 arch: x86_64 - - os: macos-12 + - os: macos-13 arch: arm64 uses: ./.github/workflows/build_check_cache.yml with: diff --git a/.github/workflows/build_check_cache.yml b/.github/workflows/build_check_cache.yml index cccc0849443..b8013a5eaf9 100644 --- a/.github/workflows/build_check_cache.yml +++ b/.github/workflows/build_check_cache.yml @@ -28,9 +28,9 @@ jobs: - name: set outputs id: set_outputs 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 - dash-arch: ${{ inputs.os == 'macos-12' && '-' || ''}}${{ inputs.os == 'macos-12' && 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' }} + 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-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-13') && 'OrcaSlicer_dep' || 'destdir' }} output-cmd: ${{ inputs.os == 'windows-latest' && '$env:GITHUB_OUTPUT' || '"$GITHUB_OUTPUT"'}} run: | echo cache-key=${{ runner.os }}${{ env.dash-arch }}-cache-orcaslicer_deps-build-${{ hashFiles('deps/**') }} >> ${{ env.output-cmd }} diff --git a/.github/workflows/build_deps.yml b/.github/workflows/build_deps.yml index e6a61029d53..0357d1c5432 100644 --- a/.github/workflows/build_deps.yml +++ b/.github/workflows/build_deps.yml @@ -67,10 +67,11 @@ jobs: cd ${{ github.workspace }}/deps/build - name: Build on Mac ${{ inputs.arch }} - if: inputs.os == 'macos-12' + if: inputs.os == 'macos-13' 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 }} @@ -97,7 +98,7 @@ jobs: # Upload Artifacts - name: Upload Mac ${{ inputs.arch }} artifacts - if: inputs.os == 'macos-12' + if: inputs.os == 'macos-13' uses: actions/upload-artifact@v3 with: name: OrcaSlicer_dep_mac_${{ inputs.arch }}_${{ env.date }} diff --git a/.github/workflows/build_orca.yml b/.github/workflows/build_orca.yml index 3091966e976..ac558acefd3 100644 --- a/.github/workflows/build_orca.yml +++ b/.github/workflows/build_orca.yml @@ -74,21 +74,24 @@ jobs: # Mac - name: Install tools mac - if: inputs.os == 'macos-12' + if: inputs.os == 'macos-13' 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}}/OrcaSlicer_dep_${{inputs.arch}} + tree ${{ github.workspace }}/deps/build_${{inputs.arch}}/OrcaSlicer_dep_${{inputs.arch}} - name: Build slicer mac - if: inputs.os == 'macos-12' + if: inputs.os == 'macos-13' working-directory: ${{ github.workspace }} run: | ./build_release_macos.sh -s -n -a ${{inputs.arch}} # Thanks to RaySajuuk, it's working now - 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 }} env: BUILD_CERTIFICATE_BASE64: ${{ secrets.BUILD_CERTIFICATE_BASE64 }} @@ -114,14 +117,14 @@ jobs: xcrun stapler staple OrcaSlicer_Mac_${{inputs.arch}}_${{ env.ver }}.dmg - 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 }} run: | 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 - name: Upload artifacts mac - if: inputs.os == 'macos-12' + if: inputs.os == 'macos-13' uses: actions/upload-artifact@v3 with: name: OrcaSlicer_Mac_${{inputs.arch}}_${{ env.ver }} diff --git a/CMakeLists.txt b/CMakeLists.txt index 3cda64ffd5f..a29560220ed 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -436,11 +436,8 @@ find_package(TBB REQUIRED) # add_definitions(-DTBB_USE_CAPTURED_EXCEPTION=0) find_package(OpenSSL REQUIRED) -if (APPLE) -find_package(CURL CONFIG REQUIRED) -else() find_package(CURL REQUIRED) -endif() + add_library(libcurl INTERFACE) target_link_libraries(libcurl INTERFACE CURL::libcurl) diff --git a/build_release_macos.sh b/build_release_macos.sh index a9defeaf24a..b7cac93c187 100755 --- a/build_release_macos.sh +++ b/build_release_macos.sh @@ -35,18 +35,19 @@ fi echo "Arch: $ARCH" echo "BUILD_TARGET: $BUILD_TARGET" -if which -s brew; then - brew --prefix libiconv - brew --prefix zstd - export LIBRARY_PATH=$LIBRARY_PATH:$(brew --prefix zstd)/lib/ -elif which -s port; then - port install libiconv - port install zstd - export LIBRARY_PATH=$LIBRARY_PATH:/opt/local/lib -else - echo "Need either brew or macports to successfully build deps" - exit 1 -fi +# if which -s brew; then +# brew --prefix libiconv +# brew --prefix zstd +# export LIBRARY_PATH=$LIBRARY_PATH:$(brew --prefix zstd)/lib/ +# elif which -s port; then +# port install libiconv +# port install zstd +# export LIBRARY_PATH=$LIBRARY_PATH:/opt/local/lib +# else +# echo "Need either brew or macports to successfully build deps" +# exit 1 +# fi + WD="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" cd $WD/deps