Skip to content

CI build: replace macos-13 with macos-15-intel #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
raulp wants to merge 1 commit into
base: master
Choose a base branch
from
+10 −10
Open

CI build: replace macos-13 with macos-15-intel #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build_all.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:
- os: ubuntu-22.04
- os: ubuntu-24.04
- os: windows-latest
- os: macos-13
- os: macos-15-intel
arch: x86_64
- os: macos-15
arch: arm64
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/build_bambu.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ jobs:

# Mac
- name: Build slicer mac
if: inputs.os == 'macos-13'
if: inputs.os == 'macos-15-intel'
working-directory: ${{ github.workspace }}
run: |
brew install automake texinfo
Expand All @@ -101,12 +101,12 @@ jobs:
./BuildMac.sh -s -x -a universal -t 10.15 -1

- name: pack mac app
if: github.ref != 'refs/heads/main' && (inputs.os == 'macos-13' || inputs.os == 'macos-15')
if: github.ref != 'refs/heads/main' && (inputs.os == 'macos-15-intel' || inputs.os == 'macos-15')
working-directory: ${{ github.workspace }}
run: zip -r BambuStudio_Mac_${{inputs.arch}}_${{ env.ver }}.zip ${{ github.workspace }}/build

- name: Upload artifacts mac
if: inputs.os == 'macos-13' || inputs.os == 'macos-15'
if: inputs.os == 'macos-15-intel' || inputs.os == 'macos-15'
uses: actions/upload-artifact@v6
with:
name: BambuStudio_Mac_${{inputs.arch}}_${{ env.ver }}
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build_check_cache.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:
- name: set outputs
id: set_outputs
env:
dep-folder-name: ${{ inputs.os == 'windows-latest' && '/BambuStudio_dep' || ((inputs.os == 'macos-13' || inputs.os == 'macos-15') && '') || (inputs.os != 'macos-13' && inputs.os != 'macos-15') && '/destdir' || '' }}
dep-folder-name: ${{ inputs.os == 'windows-latest' && '/BambuStudio_dep' || ((inputs.os == 'macos-15-intel' || inputs.os == 'macos-15') && '') || (inputs.os != 'macos-15-intel' && inputs.os != 'macos-15') && '/destdir' || '' }}
output-cmd: ${{ inputs.os == 'windows-latest' && '$env:GITHUB_OUTPUT' || '"$GITHUB_OUTPUT"'}}
run: |
echo cache-key=${{ inputs.os }}-cache-bambustudio_deps-build-${{ hashFiles('deps/**') }} >> ${{ env.output-cmd }}
Expand Down
10 changes: 5 additions & 5 deletions .github/workflows/build_deps.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ jobs:
shell: pwsh

- name: Fix python install error on mac
if: inputs.os == 'macos-13'
if: inputs.os == 'macos-15-intel'
working-directory: ${{ github.workspace }}
run: |
find /usr/local/bin -lname '*/Library/Frameworks/Python.framework/*' -delete
Expand All @@ -92,7 +92,7 @@ jobs:
df -h

- name: Build on Mac ${{ inputs.arch }}
if: inputs.os == 'macos-13'
if: inputs.os == 'macos-15-intel'
working-directory: ${{ github.workspace }}
run: |
brew install automake texinfo nasm yasm x264
Expand Down Expand Up @@ -130,7 +130,7 @@ jobs:
brew install zstd

- name: pack deps on Macos
if: inputs.os == 'macos-13' || inputs.os == 'macos-15'
if: inputs.os == 'macos-15-intel' || inputs.os == 'macos-15'
working-directory: ${{ github.workspace }}
run: |
cd ${{ github.workspace }}/deps
Expand All @@ -149,14 +149,14 @@ jobs:

# Upload Artifacts
- name: Upload Mac ${{ inputs.arch }} artifacts
if: inputs.os == 'macos-13' || inputs.os == 'macos-15'
if: inputs.os == 'macos-15-intel' || inputs.os == 'macos-15'
uses: actions/upload-artifact@v6
with:
name: BambuStudio_dep_mac_${{ inputs.arch }}_${{ env.date }}
path: ${{ github.workspace }}/deps/BambuStudio_dep_mac_${{ inputs.arch }}*.tar.gz

- name: clean artifacts
if: inputs.os == 'macos-13' || inputs.os == 'macos-15'
if: inputs.os == 'macos-15-intel' || inputs.os == 'macos-15'
working-directory: ${{ github.workspace }}
run: rm -rf ${{ github.workspace }}/deps/build/BambuStudio_dep_mac_${{ inputs.arch }}*.tar.gz

Expand Down
Loading