From c3f4e9b12c25c63097fecea32a87dc12bfb08e9f Mon Sep 17 00:00:00 2001
From: brandonbiete <bbiete@bitwarden.com>
Date: Mon, 10 Nov 2025 15:41:49 -0500
Subject: [PATCH] [BRE-1302] Update deprecated macos 13 runners (#17312)

* [BRE-1302] Update runner to macos-15 for build-browser workflow on build-safari job

* [BRE-1302] Remove macos-13 and 14, add macos-15 to os matrix for build-cli

* [BRE-1302] Update macos runner to 15 and add python setup step before setuptools install

* [BRE-1302] Update macos runner to 15 for 2 additional jobs and add python setup step
---
 .github/workflows/build-browser.yml |  2 +-
 .github/workflows/build-cli.yml     |  4 ++--
 .github/workflows/build-desktop.yml | 27 +++++++++++++++++++++------
 3 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/.github/workflows/build-browser.yml b/.github/workflows/build-browser.yml
index 1c805e8efb..4378b6de78 100644
--- a/.github/workflows/build-browser.yml
+++ b/.github/workflows/build-browser.yml
@@ -341,7 +341,7 @@ jobs:
 
   build-safari:
     name: Build Safari - ${{ matrix.license_type.readable }}
-    runs-on: macos-13
+    runs-on: macos-15
     permissions:
       contents: read
       id-token: write
diff --git a/.github/workflows/build-cli.yml b/.github/workflows/build-cli.yml
index c2abbdf5e5..414c043b89 100644
--- a/.github/workflows/build-cli.yml
+++ b/.github/workflows/build-cli.yml
@@ -93,8 +93,8 @@ jobs:
           [
             { base: "linux", distro: "ubuntu-22.04", target_suffix: "" },
             { base: "linux", distro: "ubuntu-22.04-arm", target_suffix: "-arm64" },
-            { base: "mac", distro: "macos-13", target_suffix: "" },
-            { base: "mac", distro: "macos-14", target_suffix: "-arm64" }
+            { base: "mac", distro: "macos-15-intel", target_suffix: "" },
+            { base: "mac", distro: "macos-15", target_suffix: "-arm64" }
           ]
         license_type:
           [
diff --git a/.github/workflows/build-desktop.yml b/.github/workflows/build-desktop.yml
index 02160c8928..7902cdb153 100644
--- a/.github/workflows/build-desktop.yml
+++ b/.github/workflows/build-desktop.yml
@@ -940,7 +940,7 @@ jobs:
 
   macos-build:
     name: MacOS Build
-    runs-on: macos-13
+    runs-on: macos-15
     needs:
       - setup
     permissions:
@@ -966,7 +966,12 @@ jobs:
           cache: 'npm'
           cache-dependency-path: '**/package-lock.json'
           node-version: ${{ env._NODE_VERSION }}
-
+      
+      - name: Set up Python
+        uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
+        with:
+          python-version: '3.12'
+      
       - name: Set up Node-gyp
         run: python3 -m pip install setuptools
 
@@ -1162,7 +1167,7 @@ jobs:
 
   macos-package-github:
     name: MacOS Package GitHub Release Assets
-    runs-on: macos-13
+    runs-on: macos-15
     if: ${{ needs.setup.outputs.has_secrets == 'true' }}
     needs:
       - browser-build
@@ -1191,7 +1196,12 @@ jobs:
           cache: 'npm'
           cache-dependency-path: '**/package-lock.json'
           node-version: ${{ env._NODE_VERSION }}
-
+      
+      - name: Set up Python
+        uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
+        with:
+          python-version: '3.12'
+      
       - name: Set up Node-gyp
         run: python3 -m pip install setuptools
 
@@ -1422,7 +1432,7 @@ jobs:
 
   macos-package-mas:
     name: MacOS Package Prod Release Asset
-    runs-on: macos-13
+    runs-on: macos-15
     if: ${{ needs.setup.outputs.has_secrets == 'true' }}
     needs:
       - browser-build
@@ -1451,7 +1461,12 @@ jobs:
           cache: 'npm'
           cache-dependency-path: '**/package-lock.json'
           node-version: ${{ env._NODE_VERSION }}
-
+      
+      - name: Set up Python
+        uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
+        with:
+          python-version: '3.12'
+          
       - name: Set up Node-gyp
         run: python3 -m pip install setuptools