Merge branch 'master' into tooomm-qt5

.github/workflows/desktop-build.yml

@@ -14,10 +14,8 @@ on:
       - '*/**'    # matches all files not in root
       - '!**.md'
       - '!.github/**'
-      - '!.husky/**'
       - '!.tx/**'
       - '!doc/**'
-      - '!webclient/**'
       - '.github/workflows/desktop-build.yml'
       - 'CMakeLists.txt'
       - 'vcpkg.json'
@@ -29,10 +27,8 @@ on:
       - '*/**'    # matches all files not in root
       - '!**.md'
       - '!.github/**'
-      - '!.husky/**'
       - '!.tx/**'
       - '!doc/**'
-      - '!webclient/**'
       - '.github/workflows/desktop-build.yml'
       - 'CMakeLists.txt'
       - 'vcpkg.json'
@@ -46,7 +42,7 @@ concurrency:
 jobs:
   configure:
     name: Configure
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-slim
     outputs:
       tag: ${{steps.configure.outputs.tag}}
       sha: ${{steps.configure.outputs.sha}}
@@ -111,12 +107,8 @@ jobs:
             package: skip    # We are packaged in Arch already
             allow-failure: yes
 
-          - distro: Debian
-            version: 11
-            package: DEB
-
           - distro: Servatrice_Debian
-            version: 11
+            version: 12
             package: DEB
             test: skip
             server_only: yes
@@ -131,22 +123,18 @@ jobs:
             package: DEB
 
           - distro: Fedora
-            version: 42
+            version: 43
             package: RPM
             test: skip    # Running tests on all distros is superfluous
 
           - distro: Fedora
-            version: 43
+            version: 44
             package: RPM
 
-          - distro: Ubuntu
-            version: 22.04
-            package: DEB
-            test: skip    # Running tests on all distros is superfluous
-
           - distro: Ubuntu
             version: 24.04
             package: DEB
+            test: skip    # Running tests on all distros is superfluous
 
           - distro: Ubuntu
             version: 26.04
@@ -265,7 +253,7 @@ jobs:
         shell: bash
         env:
           GH_TOKEN: ${{github.token}}
-        run: gh attestation verify ${{steps.build.outputs.path}} --repo Cockatrice/Cockatrice
+        run: gh attestation verify "${{steps.build.outputs.path}}" --repo Cockatrice/Cockatrice
 
   build-vcpkg:
     strategy:
@@ -281,7 +269,7 @@ jobs:
             override_target: 13
             make_package: 1
             package_suffix: "-macOS13_Intel"
-            qt_version: 6.11.*
+            qt_version: 6.11.0
             qt_arch: clang_64
             qt_modules: qtimageformats qtmultimedia qtwebsockets
             cmake_generator: Ninja
@@ -296,7 +284,7 @@ jobs:
             type: Release
             make_package: 1
             package_suffix: "-macOS14"
-            qt_version: 6.11.*
+            qt_version: 6.11.0
             qt_arch: clang_64
             qt_modules: qtimageformats qtmultimedia qtwebsockets
             cmake_generator: Ninja
@@ -311,7 +299,7 @@ jobs:
             type: Release
             make_package: 1
             package_suffix: "-macOS15"
-            qt_version: 6.11.*
+            qt_version: 6.11.0
             qt_arch: clang_64
             qt_modules: qtimageformats qtmultimedia qtwebsockets
             cmake_generator: Ninja
@@ -324,7 +312,7 @@ jobs:
             soc: Apple
             xcode: "16.4"
             type: Debug
-            qt_version: 6.11.*
+            qt_version: 6.11.0
             qt_arch: clang_64
             qt_modules: qtimageformats qtmultimedia qtwebsockets
             cmake_generator: Ninja
@@ -337,7 +325,7 @@ jobs:
             type: Release
             make_package: 1
             package_suffix: "-Win10"
-            qt_version: 6.11.*
+            qt_version: 6.11.0
             qt_arch: win64_msvc2022_64
             qt_modules: qtimageformats qtmultimedia qtwebsockets
             cmake_generator: "Visual Studio 17 2022"
@@ -494,7 +482,7 @@ jobs:
           if [[ -n "$MACOS_CERTIFICATE_NAME" ]]
           then
             security unlock-keychain -p "$MACOS_CI_KEYCHAIN_PWD" build.keychain
-            /usr/bin/codesign --sign="$MACOS_CERTIFICATE_NAME" --entitlements=".ci/macos.entitlements" --options=runtime --force --deep --timestamp --verbose ${{steps.build.outputs.path}}
+            /usr/bin/codesign --sign="$MACOS_CERTIFICATE_NAME" --entitlements=".ci/macos.entitlements" --options=runtime --force --deep --timestamp --verbose "${{steps.build.outputs.path}}"
           fi
 
       - name: Notarize app bundle
@@ -514,7 +502,7 @@ jobs:
             # Therefore, we create a zip file containing our app bundle, so that we can send it to the
             # notarization service
             echo "Creating temp notarization archive"
-            ditto -c -k --keepParent ${{steps.build.outputs.path}} "notarization.zip"
+            ditto -c -k --keepParent "${{steps.build.outputs.path}}" "notarization.zip"
 
             # Here we send the notarization request to the Apple's Notarization service, waiting for the result.
             # This typically takes a few seconds inside a CI environment, but it might take more depending on the App
@@ -526,7 +514,7 @@ jobs:
             # Finally, we need to "attach the staple" to our executable, which will allow our app to be
             # validated by macOS even when an internet connection is not available.
             echo "Attach staple"
-            xcrun stapler staple ${{steps.build.outputs.path}}
+            xcrun stapler staple "${{steps.build.outputs.path}}"
           fi
 
       - name: Upload artifact
@@ -573,4 +561,4 @@ jobs:
         shell: bash
         env:
           GH_TOKEN: ${{github.token}}
-        run: gh attestation verify ${{steps.build.outputs.path}} --repo Cockatrice/Cockatrice
+        run: gh attestation verify "${{steps.build.outputs.path}}" --repo Cockatrice/Cockatrice

.github/workflows/desktop-lint.yml

@@ -8,10 +8,8 @@ on:
       - '!**.md'
       - '!.ci/**'
       - '!.github/**'
-      - '!.husky/**'
       - '!.tx/**'
       - '!doc/**'
-      - '!webclient/**'
       - '.ci/lint_cpp.sh'
       - '.github/workflows/desktop-lint.yml'
       - '.clang-format'
@@ -20,13 +18,13 @@ on:
 
 jobs:
   format:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-slim
 
     steps:
     - name: Checkout
       uses: actions/checkout@v6
       with:
-        fetch-depth: 20 # should be enough to find merge base
+        fetch-depth: 20    # should be enough to find merge base
 
     - name: Install dependencies
       shell: bash

.github/workflows/docker-release.yml

@@ -1,9 +1,10 @@
 name: Build Docker Image
 
 on:
+  release:
+    types:
+      - released    # publishing of stable releases
   push:
-    tags:
-      - '*Release*'
     branches:
       - master
   pull_request:
@@ -16,16 +17,18 @@ on:
 # Cancel earlier, unfinished runs of this workflow on the same branch (unless on release)
 concurrency:
   group: "${{ github.workflow }} @ ${{ github.ref_name }}"
-  cancel-in-progress: ${{ github.ref_type != 'tag' }}
+  cancel-in-progress: ${{ github.event_name != 'release' }}
 
 jobs:
   docker:
     name: amd64 & arm64
+    if: ${{ github.repository_owner == 'Cockatrice' }}
     runs-on: ubuntu-latest
+
     permissions:
       contents: read
       packages: write
-
+  
     steps:
       - name: Checkout
         uses: actions/checkout@v6
@@ -33,6 +36,8 @@ jobs:
       - name: Docker metadata
         id: metadata
         uses: docker/metadata-action@v6
+        env:
+          DOCKER_METADATA_ANNOTATIONS_LEVELS: index    # needed for GHCR
         with:
           images: |
             ghcr.io/cockatrice/servatrice
@@ -52,7 +57,7 @@ jobs:
         uses: docker/setup-buildx-action@v4
 
       - name: Login to GitHub Container Registry
-        if: github.ref_type == 'tag'
+        if: contains(github.event.release.tag_name, 'Release') && github.event.release.target_commitish == 'master'
         uses: docker/login-action@v4
         with:
           registry: ghcr.io

.github/workflows/documentation-build.yml

@@ -33,7 +33,7 @@ jobs:
       - name: Install Doxygen
         uses: ssciwr/doxygen-install@v2
         with:
-          version: "1.14.0"
+          version: "1.16.1"
 
       - name: Update Doxygen Configuration
         run: |

.github/workflows/translations-pull.yml

@@ -16,7 +16,7 @@ jobs:
     if: github.event_name != 'schedule' || github.repository_owner == 'Cockatrice'
 
     name: Pull languages
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-slim
 
     steps:
       - name: Checkout repo
@@ -38,7 +38,6 @@ jobs:
           add-paths: |
             cockatrice/translations/*.ts
             oracle/translations/*.ts
-            webclient/public/locales/*/translation.json
           commit-message: Update translation files
           # author is the owner of the commit
           author: github-actions <github-actions@github.com>

.github/workflows/translations-push.yml

@@ -16,7 +16,7 @@ jobs:
     if: github.event_name != 'schedule' || github.repository_owner == 'Cockatrice'
 
     name: Push strings
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-slim
 
     steps:
       - name: Checkout repo
@@ -49,7 +49,7 @@ jobs:
 
       - name: Render template
         id: template
-        uses: chuhlomin/render-template@v1
+        uses: chuhlomin/render-template/binary@v1
         with:
           template: .ci/update_translation_source_strings_template.md
           vars: |

.github/workflows/web-build.yml

@@ -1,54 +0,0 @@
-name: Build Web
-
-on:
-  push:
-    branches:
-      - master
-    paths:
-      - '.husky/**'
-      - 'webclient/**'
-      - '!**.md'
-      - '.github/workflows/web-build.yml'
-  pull_request:
-    paths:
-      - '.husky/**'
-      - 'webclient/**'
-      - '!**.md'
-      - '.github/workflows/web-build.yml'
-
-jobs:
-  build-web:
-    name: React (Node ${{matrix.node_version}})
-
-    runs-on: ubuntu-latest
-
-    defaults:
-      run:
-        working-directory: webclient
-
-    strategy:
-      fail-fast: false
-      matrix:
-        node_version:
-          - 16
-          - lts/*
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v6
-
-      - name: Setup Node.js
-        uses: actions/setup-node@v6
-        with:
-          node-version: ${{matrix.node_version}}
-          cache: 'npm'
-          cache-dependency-path: 'webclient/package-lock.json'
-
-      - name: Install dependencies
-        run: npm clean-install
-
-      - name: Build app
-        run: npm run build
-
-      - name: Test app
-        run: npm run test

.github/workflows/web-lint.yml

@@ -1,33 +0,0 @@
-name: Code Style (TypeScript) 
-
-on:
-  # push trigger not needed for linting, we do not allow direct pushes to master
-  pull_request:
-    paths:
-      - 'webclient/**'
-      - '!**.md'
-      - '.github/workflows/web-lint.yml'
-
-jobs:
-  ESLint:
-    runs-on: ubuntu-latest
-    
-    defaults:
-      run:
-        working-directory: webclient
-
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v6
-
-    - name: Setup Node.js
-      uses: actions/setup-node@v6
-      with:
-        cache: 'npm'
-        cache-dependency-path: 'webclient/package-lock.json'
-
-    - name: Install ESLint
-      run: npm clean-install --ignore-scripts
-
-    - name: Run ESLint
-      run: npm run lint