@@ -84,49 +84,35 @@ jobs:
8484 retention-days : 14
8585
8686 macos :
87- name : macOS ${{ matrix.arch }} (Qt ${{ matrix.qt }} )
88- runs-on : ${{ matrix.runner }}
87+ name : macOS Apple Silicon package (Qt 6 )
88+ runs-on : macos-15
8989 timeout-minutes : 45
90- strategy :
91- fail-fast : false
92- matrix :
93- qt : ['5', '6']
94- arch : [arm64, x86_64]
95- include :
96- - arch : arm64
97- runner : macos-15
98- - arch : x86_64
99- runner : macos-15-intel
100- - qt : ' 5'
101- formula : qt@5
102- - qt : ' 6'
103- formula : qt
10490 steps :
10591 - uses : actions/checkout@v4
10692 - name : Install macOS build dependencies
107- run : brew install cmake ninja "${{ matrix.formula }}"
93+ run : brew install cmake ninja qt
10894
10995 - name : Build QNetStats
11096 run : |
11197 set -euo pipefail
112- qt_prefix="$(brew --prefix "${{ matrix.formula }}" )"
98+ qt_prefix="$(brew --prefix qt )"
11399 cmake -S . -B build -G Ninja -DCMAKE_BUILD_TYPE=Release \
114- -DUSE_QT=${{ matrix.qt }} -DCMAKE_PREFIX_PATH="$qt_prefix" \
115- -DCMAKE_OSX_ARCHITECTURES=${{ matrix.arch }}
100+ -DUSE_QT=6 -DCMAKE_PREFIX_PATH="$qt_prefix" \
101+ -DCMAKE_OSX_ARCHITECTURES=arm64
116102 cmake --build build --parallel 3
117103
118104 - name : Deploy, sign and package macOS app
119105 shell : bash
120106 run : |
121107 set -euo pipefail
122- qt_prefix="$(brew --prefix "${{ matrix.formula }}" )"
108+ qt_prefix="$(brew --prefix qt )"
123109 qt_bin="$qt_prefix/bin"
124110 export PATH="$qt_bin:$PATH"
125111 cd build
126112 bundle=QNetStats.app
127113 test -d "$bundle"
128- test "$(uname -m)" = "${{ matrix.arch }} "
129- lipo "$bundle/Contents/MacOS/QNetStats" -verify_arch "${{ matrix.arch }} "
114+ test "$(uname -m)" = "arm64 "
115+ lipo "$bundle/Contents/MacOS/QNetStats" -verify_arch "arm64 "
130116 cp ../COPYING "$bundle/Contents/Resources/LICENSE.txt"
131117
132118 # Stage the plugin types used by this Widgets application. Keep all
@@ -227,12 +213,12 @@ jobs:
227213 -format UDZO "QNetStats.dmg"
228214 hdiutil verify "QNetStats.dmg"
229215 mkdir -p package
230- mv QNetStats.dmg "package/QNetStats-macOS-${{ matrix.arch }}-Qt${{ matrix.qt }} .dmg"
216+ mv QNetStats.dmg "package/QNetStats-macOS-arm64-Qt6 .dmg"
231217
232218 - name : Upload macOS package
233219 uses : actions/upload-artifact@v4
234220 with :
235- name : QNetStats-macOS-${{ matrix.arch }}-Qt${{ matrix.qt }} -${{ github.sha }}
221+ name : QNetStats-macOS-arm64-Qt6 -${{ github.sha }}
236222 path : build/package/*.dmg
237223 if-no-files-found : error
238224 retention-days : 14
0 commit comments