Merge remote-tracking branch 'upstream/release/1.14.0' into standardised_strings_qa_2

.github/workflows/build-binaries.yml

@@ -6,14 +6,15 @@ on:
     branches:
       - clearnet
       - unstable
-      - release/
-      - ci/
+      - 'release/**'
+      - 'ci/**'
   pull_request:
     branches:
       - clearnet
       - unstable
-      - release/
-      - ci/
+      - 'release/**'
+      - 'ci/**'
+
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
   cancel-in-progress: true
@@ -25,7 +26,8 @@ jobs:
       fail-fast: false
       matrix:
         # We want a mac arm64 build, and according to this https://github.com/actions/runner-images#available-images macos-14 is always arm64
-        os: [windows-2022, ubuntu-20.04, macos-12, macos-14]
+        # macos-14 is disabled for now as we hit our free tier limit for macos builds
+        os: [windows-2022, ubuntu-20.04, macos-12]
     env:
       SIGNAL_ENV: production
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/pull-request.yml

@@ -6,8 +6,8 @@ on:
     branches:
       - clearnet
       - unstable
-      - release/
-      - ci/
+      - 'release/**'
+      - 'ci/**'
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
@@ -20,7 +20,8 @@ jobs:
       fail-fast: false
       matrix:
         # We want a mac arm64 build, and according to this https://github.com/actions/runner-images#available-images macos-14 is always arm64
-        os: [windows-2022, ubuntu-20.04, macos-12, macos-14]
+        # macos-14 is disabled for now as we hit our free tier limit for macos builds
+        os: [windows-2022, ubuntu-20.04, macos-12]
     env:
       SIGNAL_ENV: production
       GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}