diff --git a/.github/workflows/build_bambu.yml b/.github/workflows/build_bambu.yml index 74cdae2ff8..194bb774f1 100644 --- a/.github/workflows/build_bambu.yml +++ b/.github/workflows/build_bambu.yml @@ -78,7 +78,7 @@ jobs: if: inputs.os == 'macos-13' working-directory: ${{ github.workspace }} run: | - brew install cmake git gettext automake texinfo + brew install automake texinfo mkdir -p ${{ github.workspace }}/build_${{inputs.arch}} cd ${{ github.workspace }}/build_${{inputs.arch}} cmake .. -DBBL_RELEASE_TO_PUBLIC=1 -DCMAKE_PREFIX_PATH="${{ github.workspace }}/deps/build_${{ inputs.arch }}/BambuStudio_dep_${{ inputs.arch }}/usr/local" -DCMAKE_INSTALL_PREFIX="../install_dir" -DCMAKE_BUILD_TYPE=Release -DCMAKE_MACOSX_RPATH=ON -DCMAKE_INSTALL_RPATH="${{ github.workspace }}/deps/build_${{ inputs.arch }}/BambuStudio_dep_${{ inputs.arch }}/usr/local" -DCMAKE_MACOSX_BUNDLE=on diff --git a/.github/workflows/build_deps.yml b/.github/workflows/build_deps.yml index d6f861d73d..d4ead356b8 100644 --- a/.github/workflows/build_deps.yml +++ b/.github/workflows/build_deps.yml @@ -79,7 +79,7 @@ jobs: if: inputs.os == 'macos-13' working-directory: ${{ github.workspace }} run: | - brew install cmake git gettext automake texinfo + brew install automake texinfo brew uninstall --ignore-dependencies zstd mkdir -p ${{ github.workspace }}/deps/build_${{ inputs.arch }} mkdir -p ${{ github.workspace }}/deps/build_${{ inputs.arch }}/BambuStudio_dep_${{ inputs.arch }} @@ -88,6 +88,11 @@ jobs: make -j4 brew install zstd + - name: pack deps on Macos + if: inputs.os == 'macos-13' + working-directory: ${{ github.workspace }} + run: tar -zcvf "BambuStudio_dep_mac_${{ inputs.arch }}_$(date +"%Y%m%d").tar.gz" "${{ github.workspace }}/deps/build_${{ inputs.arch }}/BambuStudio_dep_${{ inputs.arch }}" + - name: Build on Ubuntu if: inputs.os == 'ubuntu-20.04' || inputs.os == 'ubuntu-24.04' @@ -110,7 +115,7 @@ jobs: uses: actions/upload-artifact@v4 with: name: BambuStudio_dep_mac_${{ inputs.arch }}_${{ env.date }} - path: ${{ github.workspace }}/deps/build_${{ inputs.arch }}/BambuStudio_dep*.tar.gz + path: ${{ github.workspace }}/BambuStudio_dep_mac_${{ inputs.arch }}*.tar.gz - name: Upload Windows artifacts if: inputs.os == 'windows-latest'