Skip to content

Commit edc0683

Browse files
committed
CI: Qt 6.8.1, add Ubuntu 22.04 ARM, retry hdiutil
hdiutil randomly fails with EBUSY, presumably due to some "XProtectBehaviorService" introduced with macOS 13. actions/runner-images#7522
1 parent b3fc6ce commit edc0683

File tree

1 file changed

+20
-6
lines changed

1 file changed

+20
-6
lines changed

.github/workflows/build_and_release.yml

+20-6
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,14 @@ jobs:
1515
fail-fast: false
1616
matrix:
1717
job:
18-
- name: Ubuntu 22.04
18+
- name: Ubuntu 22.04 amd64
1919
runner: ubuntu-22.04
2020
target: ubuntu22.04-amd64
2121

22+
- name: Ubuntu 22.04 arm64
23+
runner: ubuntu-22.04-arm
24+
target: ubuntu22.04-arm64
25+
2226
- name: Windows x86
2327
runner: windows-latest
2428
target: win32
@@ -32,8 +36,8 @@ jobs:
3236
- name: Windows x64
3337
runner: windows-latest
3438
target: win64
35-
qt_arch: win64_msvc2019_64
36-
qt_version: 6.7.2
39+
qt_arch: win64_msvc2022_64
40+
qt_version: 6.8.1
3741
qt_archives: d3dcompiler_47 opengl32sw qtbase qtdeclarative qttools qttranslations
3842
qt_modules: qt5compat qtmultimedia qtpositioning qtwebchannel qtwebengine
3943
cmake_args: -DCMAKE_C_COMPILER=cl -DCMAKE_CXX_COMPILER=cl
@@ -53,7 +57,7 @@ jobs:
5357
runner: macos-latest
5458
target: macos11-arm
5559
qt_arch: clang_64
56-
qt_version: 6.7.2
60+
qt_version: 6.8.1
5761
qt_archives: qttranslations qttools qtdeclarative qtbase
5862
qt_modules: qtmultimedia qtpositioning qtwebchannel qtwebengine qt5compat
5963
cmake_args: -DCMAKE_OSX_ARCHITECTURES='arm64'
@@ -64,7 +68,7 @@ jobs:
6468
runner: macos-latest
6569
target: macos11-intel
6670
qt_arch: clang_64
67-
qt_version: 6.7.2
71+
qt_version: 6.8.1
6872
qt_archives: qttranslations qttools qtdeclarative qtbase
6973
qt_modules: qtmultimedia qtpositioning qtwebchannel qtwebengine qt5compat
7074
cmake_args: -DCMAKE_OSX_ARCHITECTURES='x86_64'
@@ -237,7 +241,17 @@ jobs:
237241
mv "$file.$arch" "$file"
238242
done
239243
fi
240-
hdiutil create -srcfolder bin -volname "$volname" -format ${{ matrix.job.macos_dmg_format }} "$volname".dmg
244+
# https://github.com/actions/runner-images/issues/7522
245+
try=1
246+
until hdiutil create -srcfolder bin -volname "$volname" -format ${{ matrix.job.macos_dmg_format }} "$volname".dmg
247+
do
248+
if [ "$try" -eq 10 ]; then
249+
echo "Error: hdiutil failed after $try tries"
250+
exit 1
251+
fi
252+
try=$((try + 1))
253+
sleep 2
254+
done
241255
mv bin/qolibri.app .
242256
mv "$volname".dmg bin/
243257

0 commit comments

Comments
 (0)