From 44d2cbfcca747fe5dff0be9ac7ab2f521b269db2 Mon Sep 17 00:00:00 2001
From: Yohei Yukawa <yukawa@google.com>
Date: Thu, 1 Feb 2024 22:47:09 -0800
Subject: [PATCH] Switch to `macos-14`

---
 .github/workflows/macos.yaml | 42 +++++++++++++++++-------------------
 1 file changed, 20 insertions(+), 22 deletions(-)

diff --git a/.github/workflows/macos.yaml b/.github/workflows/macos.yaml
index 45679ecf7..6486cba48 100644
--- a/.github/workflows/macos.yaml
+++ b/.github/workflows/macos.yaml
@@ -13,9 +13,9 @@ concurrency:
 
 jobs:
   build_arm64:
-    # https://github.com/actions/virtual-environments/blob/main/images/macos/macos-11-Readme.md
-    runs-on: macos-11
-    timeout-minutes: 90
+    # https://github.com/actions/virtual-environments/blob/main/images/macos/macos-14-Readme.md
+    runs-on: macos-14
+    timeout-minutes: 60
 
     steps:
       - name: checkout
@@ -27,7 +27,7 @@ jobs:
         uses: actions/setup-python@v4
         with:
           cache: 'pip'
-          python-version: '3.9'
+          python-version: '3.11'
 
       - name: Install pip dependencies
         working-directory: ./src
@@ -48,10 +48,8 @@ jobs:
 
       - name: Build Qt
         working-directory: ./src
-        # We haven't succeeded to cross build Qt6 for arm64 on intel mac.
-        # Build a Universal macOS Binary for Qt6 as a workaround.
         run: |
-          python3 build_tools/build_qt.py --release --confirm_license --macos_cpus=x86_64,arm64
+          python3 build_tools/build_qt.py --release --confirm_license --macos_cpus=arm64
           echo "MOZC_QT_PATH=${PWD}/third_party/qt" >> $GITHUB_ENV
 
       - name: bazel build
@@ -67,9 +65,9 @@ jobs:
           if-no-files-found: warn
 
   build_intel64:
-    # https://github.com/actions/virtual-environments/blob/main/images/macos/macos-11-Readme.md
-    runs-on: macos-11
-    timeout-minutes: 90
+    # https://github.com/actions/virtual-environments/blob/main/images/macos/macos-14-Readme.md
+    runs-on: macos-14
+    timeout-minutes: 60
 
     steps:
       - name: checkout
@@ -81,7 +79,7 @@ jobs:
         uses: actions/setup-python@v4
         with:
           cache: 'pip'
-          python-version: '3.9'
+          python-version: '3.11'
 
       - name: Install pip dependencies
         working-directory: ./src
@@ -119,9 +117,9 @@ jobs:
           if-no-files-found: warn
 
   build_universal_binary:
-    # https://github.com/actions/virtual-environments/blob/main/images/macos/macos-11-Readme.md
-    runs-on: macos-11
-    timeout-minutes: 120
+    # https://github.com/actions/virtual-environments/blob/main/images/macos/macos-14-Readme.md
+    runs-on: macos-14
+    timeout-minutes: 90
 
     steps:
       - name: checkout
@@ -133,7 +131,7 @@ jobs:
         uses: actions/setup-python@v4
         with:
           cache: 'pip'
-          python-version: '3.9'
+          python-version: '3.11'
 
       - name: Install pip dependencies
         working-directory: ./src
@@ -171,9 +169,9 @@ jobs:
           if-no-files-found: warn
 
   test:
-    # https://github.com/actions/virtual-environments/blob/main/images/macos/macos-11-Readme.md
-    runs-on: macos-11
-    timeout-minutes: 90
+    # https://github.com/actions/virtual-environments/blob/main/images/macos/macos-14-Readme.md
+    runs-on: macos-14
+    timeout-minutes: 60
 
     steps:
       - name: checkout
@@ -185,7 +183,7 @@ jobs:
         uses: actions/setup-python@v4
         with:
           cache: 'pip'
-          python-version: '3.9'
+          python-version: '3.11'
 
       - name: Install pip dependencies
         working-directory: ./src
@@ -219,8 +217,8 @@ jobs:
   # in other jobs. Another approach would be to use "needs:".
   # https://docs.github.com/en/actions/using-jobs/using-jobs-in-a-workflow
   cache_deps:
-    # https://github.com/actions/virtual-environments/blob/main/images/macos/macos-11-Readme.md
-    runs-on: macos-11
+    # https://github.com/actions/virtual-environments/blob/main/images/macos/macos-14-Readme.md
+    runs-on: macos-14
     timeout-minutes: 15
 
     steps:
@@ -230,7 +228,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
-          python-version: '3.9'
+          python-version: '3.11'
 
       - name: Install pip dependencies
         working-directory: ./src