From 912463178becd104982214a0017adf09891b6fe9 Mon Sep 17 00:00:00 2001
From: Yee Cheng Chin <ychin.git@gmail.com>
Date: Wed, 24 Jul 2024 23:58:11 -0700
Subject: [PATCH] Update CI to remove macOS-11 which has been removed from
 GitHub Actions

Also make the brew install commands not emit unnecessary warnings when
the package is already installed.
---
 .github/actions/universal-package/action.yml |  2 +-
 .github/workflows/ci-macvim.yaml             | 13 +++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.github/actions/universal-package/action.yml b/.github/actions/universal-package/action.yml
index c1fd5adacb..5f7e9005fb 100644
--- a/.github/actions/universal-package/action.yml
+++ b/.github/actions/universal-package/action.yml
@@ -67,7 +67,7 @@ runs:
         formula=${{ inputs.formula }}
 
         # This will be a no-op if formula was cached
-        brew install --formula -s ./${formula}.rb
+        brew install --quiet --formula -s ./${formula}.rb
 
         # If formula was cached, this step is necessary to relink it to brew prefix (e.g. /usr/local)
         brew unlink ${formula} && brew link ${formula}
diff --git a/.github/workflows/ci-macvim.yaml b/.github/workflows/ci-macvim.yaml
index 022f2d1c76..a4ae9aec33 100644
--- a/.github/workflows/ci-macvim.yaml
+++ b/.github/workflows/ci-macvim.yaml
@@ -54,8 +54,9 @@ jobs:
       matrix:
         include:
           # Oldest version of Xcode supported on GitHub Action to test source code backwards compatibility
-          - os: macos-11
-            xcode: '11.7'
+          # This version of Xcode can run on macOS 11 where as 13.3 has to run on macOS 12.
+          - os: macos-12
+            xcode: '13.2.1'
             extra: [vimtags, check-xcodeproj-compat]
 
           # Older version of Xcode, and used to publish legacy builds (for macOS 10.9 - 10.12)
@@ -127,12 +128,12 @@ jobs:
 
       - name: Install packages
         run: |
-          brew install libtool
+          brew install --quiet libtool
 
       - name: Install packages for testing
         run: |
           # Apple diff is broken. Use GNU diff instead. See http://github.com/vim/vim/issues/14056.
-          brew install diffutils
+          brew install --quiet diffutils
 
       - name: Grant microphone access for macos-14
         if: matrix.os == 'macos-14'
@@ -147,8 +148,8 @@ jobs:
           # be installed on runners. Since we use stable ABI, the exact version
           # on CI does not matter.
 
-          brew install ruby
-          brew install lua
+          brew install --quiet ruby
+          brew install --quiet lua
 
           if [[ -d $(brew --prefix)/Cellar/perl ]]; then
             # We just use system perl to reduce dependencies