Merge branch 'master' into tooomm-qt5

.github/workflows/desktop-build.yml

@@ -271,7 +271,6 @@ jobs:
             override_target: 13
             package_suffix: "-macOS13_Intel"
             qt_version: 6.11.0
-            qt_arch: clang_64
             qt_modules: qtimageformats qtmultimedia qtwebsockets
             soc: Intel
             type: Release
@@ -287,7 +286,6 @@ jobs:
             make_package: 1
             package_suffix: "-macOS14"
             qt_version: 6.11.0
-            qt_arch: clang_64
             qt_modules: qtimageformats qtmultimedia qtwebsockets
             soc: Apple
             type: Release
@@ -303,7 +301,6 @@ jobs:
             make_package: 1
             package_suffix: "-macOS15"
             qt_version: 6.11.0
-            qt_arch: clang_64
             qt_modules: qtimageformats qtmultimedia qtwebsockets
             soc: Apple
             type: Release
@@ -317,7 +314,6 @@ jobs:
             ccache_eviction_age: 7d
             cmake_generator: Ninja
             qt_version: 6.11.0
-            qt_arch: clang_64
             qt_modules: qtimageformats qtmultimedia qtwebsockets
             soc: Apple
             type: Debug
@@ -333,7 +329,6 @@ jobs:
             make_package: 1
             package_suffix: "-Win10"
             qt_version: 6.11.0
-            qt_arch: win64_msvc2022_64
             qt_modules: qtimageformats qtmultimedia qtwebsockets
             type: Release
 
@@ -398,7 +393,6 @@ jobs:
         if: matrix.os == 'macOS' && steps.restore_qt.outputs.cache-hit != 'true'
         uses: jurplel/install-qt-action@v4
         with:
-          arch: ${{ matrix.qt_arch }}
           cache: false
           dir: ${{ github.workspace }}
           modules: ${{ matrix.qt_modules }}
@@ -421,7 +415,6 @@ jobs:
         with:
           # Qt 6.11.0 only works with aqtinstall directly from git until aqtinstall 3.4 is released
           aqtsource: git+https://github.com/miurahr/aqtinstall.git
-          arch: ${{ matrix.qt_arch }}
           cache: true
           modules: ${{ matrix.qt_modules }}
           version: ${{ steps.resolve_qt_version.outputs.version }}

.github/workflows/docker-release.yml

@@ -56,8 +56,9 @@ jobs:
       - name: "Set up Docker buildx"
         uses: docker/setup-buildx-action@v4
 
-      - name: "Login to GitHub Container Registry"
-        if: contains(github.event.release.tag_name, 'Release') && github.event.release.target_commitish == 'master'
+      - name: "Login to GitHub Container Registry (GHCR)"
+        if: github.event_name == 'release' && github.event.release.prerelease == false
+        id: login
         uses: docker/login-action@v4
         with:
           password: ${{ github.token }}
@@ -73,5 +74,5 @@ jobs:
           context: .
           labels: ${{ steps.metadata.outputs.labels }}
           platforms: linux/amd64,linux/arm64
-          push: ${{ github.ref_type == 'tag' }}
+          push: ${{ steps.login.outcome == 'success' }}
           tags: ${{ steps.metadata.outputs.tags }}