From 893f763d88a9c62287c48cf4f94eb5bb8a7ae43e Mon Sep 17 00:00:00 2001
From: harens <12570877+harens@users.noreply.github.com>
Date: Sun, 18 Sep 2022 12:57:42 +0100
Subject: [PATCH] Remove macOS 10.15 builder

- Remove deprecated macOS 10.15 builder in favour of macOS 11 and 12.
- Also merge upstream changes from https://github.com/dawidd6/homebrew-tap.
---
 .github/workflows/building-uploading-all.yml |  3 ++-
 .github/workflows/testing.yml                | 23 +++++++++++++-------
 README.md                                    |  2 +-
 3 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/building-uploading-all.yml b/.github/workflows/building-uploading-all.yml
index d7f09eb..b79080e 100755
--- a/.github/workflows/building-uploading-all.yml
+++ b/.github/workflows/building-uploading-all.yml
@@ -15,7 +15,8 @@ jobs:
       matrix:
         os:
           - ubuntu-18.04
-          - macos-10.15
+          - macos-11
+          - macos-12
     runs-on: ${{matrix.os}}
     steps:
       - name: Set up Homebrew
diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
index 2050864..e1f6fbd 100755
--- a/.github/workflows/testing.yml
+++ b/.github/workflows/testing.yml
@@ -11,7 +11,7 @@ jobs:
   check:
     runs-on: ubuntu-latest
     container:
-      image: ghcr.io/homebrew/ubuntu16.04:master
+      image: ghcr.io/homebrew/ubuntu22.04:master
     steps:
       - name: Set up Homebrew
         uses: Homebrew/actions/setup-homebrew@master
@@ -23,20 +23,27 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os:
-          - ubuntu-18.04
-          - macos-10.15
+        include:
+          - os: ubuntu-latest
+            container:
+              image: ghcr.io/homebrew/ubuntu22.04:master
+              options: --user=linuxbrew
+          - os: macos-11
+          - os: macos-12
     runs-on: ${{matrix.os}}
+    container: ${{matrix.container}}
     steps:
       - name: Set up Homebrew
         uses: Homebrew/actions/setup-homebrew@master
       - name: Build bottles
         run: |
-          brew test-bot --only-cleanup-before
-          brew test-bot --only-formulae --skip-recursive-dependents
+          mkdir ~/bottles
+          cd ~/bottles
+          brew test-bot
       - name: Upload bottles
         if: always()
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: bottles
-          path: '*.bottle.*'
+          path: ~/bottles
+          if-no-files-found: error
diff --git a/README.md b/README.md
index 2b731a5..c4cc835 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@ or alternatively...
 brew install beartype/beartype/<FORMULA>
 ```
 
-Pre-compiled bottles are available for macOS Catalina, Big Sur and x86_64 Linux.
+Pre-compiled bottles are available for macOS Big Sur, Monterey and x86_64 Linux.
 
 ## Formulae/Casks