From edc0683915c0a99872a4c04ff53afe0f5df101fb Mon Sep 17 00:00:00 2001
From: Matthias von Faber <mvf@gmx.eu>
Date: Sat, 18 Jan 2025 14:19:04 +0100
Subject: [PATCH] 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.

https://github.com/actions/runner-images/issues/7522
---
 .github/workflows/build_and_release.yml | 26 +++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/build_and_release.yml b/.github/workflows/build_and_release.yml
index 0c22c3c..e5fec49 100644
--- a/.github/workflows/build_and_release.yml
+++ b/.github/workflows/build_and_release.yml
@@ -15,10 +15,14 @@ jobs:
       fail-fast: false
       matrix:
         job:
-          - name: Ubuntu 22.04
+          - name: Ubuntu 22.04 amd64
             runner: ubuntu-22.04
             target: ubuntu22.04-amd64
 
+          - name: Ubuntu 22.04 arm64
+            runner: ubuntu-22.04-arm
+            target: ubuntu22.04-arm64
+
           - name: Windows x86
             runner: windows-latest
             target: win32
@@ -32,8 +36,8 @@ jobs:
           - name: Windows x64
             runner: windows-latest
             target: win64
-            qt_arch: win64_msvc2019_64
-            qt_version: 6.7.2
+            qt_arch: win64_msvc2022_64
+            qt_version: 6.8.1
             qt_archives: d3dcompiler_47 opengl32sw qtbase qtdeclarative qttools qttranslations
             qt_modules: qt5compat qtmultimedia qtpositioning qtwebchannel qtwebengine
             cmake_args: -DCMAKE_C_COMPILER=cl -DCMAKE_CXX_COMPILER=cl
@@ -53,7 +57,7 @@ jobs:
             runner: macos-latest
             target: macos11-arm
             qt_arch: clang_64
-            qt_version: 6.7.2
+            qt_version: 6.8.1
             qt_archives: qttranslations qttools qtdeclarative qtbase
             qt_modules: qtmultimedia qtpositioning qtwebchannel qtwebengine qt5compat
             cmake_args: -DCMAKE_OSX_ARCHITECTURES='arm64'
@@ -64,7 +68,7 @@ jobs:
             runner: macos-latest
             target: macos11-intel
             qt_arch: clang_64
-            qt_version: 6.7.2
+            qt_version: 6.8.1
             qt_archives: qttranslations qttools qtdeclarative qtbase
             qt_modules: qtmultimedia qtpositioning qtwebchannel qtwebengine qt5compat
             cmake_args: -DCMAKE_OSX_ARCHITECTURES='x86_64'
@@ -237,7 +241,17 @@ jobs:
               mv "$file.$arch" "$file"
             done
           fi
-          hdiutil create -srcfolder bin -volname "$volname" -format ${{ matrix.job.macos_dmg_format }} "$volname".dmg
+          # https://github.com/actions/runner-images/issues/7522
+          try=1
+          until hdiutil create -srcfolder bin -volname "$volname" -format ${{ matrix.job.macos_dmg_format }} "$volname".dmg
+          do
+            if [ "$try" -eq 10 ]; then
+              echo "Error: hdiutil failed after $try tries"
+              exit 1
+            fi
+            try=$((try + 1))
+            sleep 2
+          done
           mv bin/qolibri.app .
           mv "$volname".dmg bin/