Skip to content

Commit 7640ba6

Browse files
authored
Fix Intel package builds (#96)
1 parent f2d5da7 commit 7640ba6

File tree

2 files changed

+15
-12
lines changed

2 files changed

+15
-12
lines changed

.github/workflows/build_packages.yml

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -25,21 +25,24 @@ jobs:
2525
with:
2626
fetch-depth: 20
2727

28-
- name: Use the Command Line Tools
29-
run: |
30-
sudo xcode-select -s /Library/Developer/CommandLineTools
31-
3228
- name: Install Homebrew dependencies
3329
run: |
3430
brew update
35-
brew upgrade
36-
brew unlink libtiff python
37-
brew install ninja python@3.11
31+
brew unlink libtiff
32+
brew install ninja python@3.12
33+
34+
- name: Remove conflicting packages
35+
run: |
36+
sudo rm -rf /Library/Frameworks/Mono.framework/
37+
38+
- name: Use the Command Line Tools
39+
run: |
40+
sudo xcode-select -s /Library/Developer/CommandLineTools
3841
3942
- name: Install Qt6
4043
run: |
41-
python3.11 -m pip install --upgrade pip setuptools wheel
42-
python3.11 -m pip install aqtinstall
44+
python3.12 -m pip install --upgrade pip setuptools wheel
45+
python3.12 -m pip install aqtinstall
4346
aqt install-qt -O ${{ github.workspace }}/Qt/ mac desktop ${QT_VERSION}
4447
4548
- name: Install vc-deps
@@ -70,12 +73,12 @@ jobs:
7073
- name: Create package
7174
run: |
7275
cmake --install build/ --prefix "${{ env.install_dir }}"
73-
python3.11 utils/scripts/macos_codesign_release.py -i "${{ env.install_dir }}"
76+
python3.12 utils/scripts/macos_codesign_release.py -i "${{ env.install_dir }}"
7477
ditto -c -k "${{ env.install_dir }}" ${{ env.package_name }}
7578
7679
- name: Upload artifacts
7780
uses: actions/upload-artifact@v4
7881
if: success()
7982
with:
8083
name: package-macos-intel
81-
path: ${{ env.package_name }}
84+
path: ${{ env.package_name }}

vc-deps

0 commit comments

Comments
 (0)