Merge branch 'master' into homebrew_debug

.github/workflows/desktop-build.yml

@@ -4,25 +4,39 @@ permissions:
   contents: write
   id-token: write
   attestations: write
+  actions: write # needed for ccache action to be able to delete gha caches
 
 on:
   push:
     branches:
       - master
-    paths-ignore:
-      - '**.md'
-      - 'webclient/**'
-      - '.github/workflows/web-*.yml'
-      - '.github/workflows/translations-*.yml'
-      - '.github/workflows/docker-release.yml'
+    paths:
+      - '*/**'    # matches all files not in root
+      - '!**.md'
+      - '!.github/**'
+      - '!.husky/**'
+      - '!.tx/**'
+      - '!doc/**'
+      - '!webclient/**'
+      - '.github/workflows/desktop-build.yml'
+      - 'CMakeLists.txt'
+      - 'vcpkg.json'
+      - 'vcpkg'
     tags:
       - '*'
   pull_request:
-    paths-ignore:
-      - '**.md'
-      - 'webclient/**'
-      - '.github/workflows/web-*.yml'
-      - '.github/workflows/translations-*.yml'
+    paths:
+      - '*/**'    # matches all files not in root
+      - '!**.md'
+      - '!.github/**'
+      - '!.husky/**'
+      - '!.tx/**'
+      - '!doc/**'
+      - '!webclient/**'
+      - '.github/workflows/desktop-build.yml'
+      - 'CMakeLists.txt'
+      - 'vcpkg.json'
+      - 'vcpkg'
 
 # Cancel earlier, unfinished runs of this workflow on the same branch (unless on master)
 concurrency:
@@ -232,10 +246,11 @@ jobs:
         include:
           - target: 13
             soc: Intel
-            os: macos-13
-            xcode: "14.3.1"
+            os: macos-15-intel
+            xcode: "16.4"
             type: Release
             make_package: 1
+            override_target: 13
 
           - target: 14
             soc: Apple
@@ -247,7 +262,7 @@ jobs:
           - target: 15
             soc: Apple
             os: macos-15
-            xcode: "16.2"
+            xcode: "16.4"
             type: Release
             make_package: 1
 
@@ -312,6 +327,7 @@ jobs:
           CMAKE_GENERATOR: '${{env.CMAKE_GENERATOR}}'
           VCPKG_DISABLE_METRICS: 1
           VCPKG_BINARY_SOURCES: 'clear;files,${{ steps.vcpkg-cache.outputs.path }},readwrite'
+          TARGET_MACOS_VERSION: ${{ matrix.override_target }}
         run: .ci/compile.sh --server --test --ccache "$CCACHE_SIZE" --vcpkg
 
       - name: Sign app bundle

.github/workflows/desktop-lint.yml

@@ -1,13 +1,22 @@
 name: Code Style (C++) 
 
 on:
+  # push trigger not needed for linting, we do not allow direct pushes to master
   pull_request:
-    paths-ignore:
-      - '**.md'
-      - 'webclient/**'
-      - '.github/workflows/web-*.yml'
-      - '.github/workflows/translations-*.yml'
-      - '.github/workflows/docker-release.yml'
+    paths:
+      - '*/**'    # matches all files not in root
+      - '!**.md'
+      - '!.ci/**'
+      - '!.github/**'
+      - '!.husky/**'
+      - '!.tx/**'
+      - '!doc/**'
+      - '!webclient/**'
+      - '.ci/lint_cpp.sh'
+      - '.github/workflows/desktop-lint.yml'
+      - '.clang-format'
+      - '.cmake-format.json'
+      - 'format.sh'
 
 jobs:
   format:

.github/workflows/translations-pull.yml

@@ -7,6 +7,7 @@ on:
     - cron: '0 0 15 1,4,7,10 *'
   pull_request:
     paths:
+      - '.tx/**'
       - '.github/workflows/translations-pull.yml'
 
 jobs:

.github/workflows/translations-push.yml

@@ -7,6 +7,7 @@ on:
     - cron: '0 0 1 1,4,7,10 *'
   pull_request:
     paths:
+      - '.ci/update_translation_source_strings.sh'
       - '.github/workflows/translations-push.yml'
 
 jobs:
@@ -30,10 +31,10 @@ jobs:
       - name: Update Cockatrice translation source
         id: cockatrice
         shell: bash
-        env:
-          FILE: 'cockatrice/cockatrice_en@source.ts'
-          DIRS: 'cockatrice/src common'
-        run: .ci/update_translation_source_strings.sh
+        run: |
+          FILE="cockatrice/cockatrice_en@source.ts"
+          export DIRS="cockatrice/src $(find . -maxdepth 1 -type d -name 'libcockatrice_*')"
+          FILE="$FILE" DIRS="$DIRS" .ci/update_translation_source_strings.sh
 
       - name: Update Oracle translation source
         id: oracle

.github/workflows/web-build.yml

@@ -5,14 +5,16 @@ on:
     branches:
       - master
     paths:
-      - '.github/workflows/web-*.yml'
+      - '.husky/**'
       - 'webclient/**'
       - '!**.md'
+      - '.github/workflows/web-build.yml'
   pull_request:
     paths:
-      - '.github/workflows/web-*.yml'
+      - '.husky/**'
       - 'webclient/**'
       - '!**.md'
+      - '.github/workflows/web-build.yml'
 
 jobs:
   build-web:

.github/workflows/web-lint.yml

@@ -1,11 +1,12 @@
 name: Code Style (TypeScript) 
 
 on:
+  # push trigger not needed for linting, we do not allow direct pushes to master
   pull_request:
     paths:
-      - '.github/workflows/web-*.yml'
       - 'webclient/**'
       - '!**.md'
+      - '.github/workflows/web-lint.yml'
 
 jobs:
   ESLint: