From 7126a2f5221ac15fdd53c9a78d0680569a7aa546 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Fri, 24 Apr 2020 09:08:55 -0500
Subject: [PATCH 1/2] build.yml: Adjust for change in 'brew'

'brew' apparently introduced an incompatible change, where even
"--force" does not actually make the commands available in the default path.

Also switch to a numbered macos release instead of "latest", though this
did not save us from breaking changes in brew or other preinstalled sw.
---
 .github/workflows/build.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index fa3aee4a5d..4e4b8bd0b6 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -94,15 +94,15 @@ jobs:
         path: mpy-cross/mpy-cross.static.exe
 
   mpy-cross-mac:
-    runs-on: macos-latest
+    runs-on: macos-10.15
     steps:
     - name: Dump GitHub context
       env:
         GITHUB_CONTEXT: ${{ toJson(github) }}
       run: echo "$GITHUB_CONTEXT"
-    - name: Install deps
+    - name: Make gettext programs available
       run: |
-        brew link --force gettext
+        echo "::set-env name=PATH::/usr/local/opt/gettext/bin:$PATH"
     - name: Versions
       run: |
         gcc --version

From f1bf4de452ad16b18cb7fab480732f6ef535eba4 Mon Sep 17 00:00:00 2001
From: Jeff Epler <jepler@gmail.com>
Date: Fri, 24 Apr 2020 09:28:12 -0500
Subject: [PATCH 2/2] brew install just for safetys sake

---
 .github/workflows/build.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 4e4b8bd0b6..91bc6f4a3e 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -102,6 +102,7 @@ jobs:
       run: echo "$GITHUB_CONTEXT"
     - name: Make gettext programs available
       run: |
+        brew install gettext
         echo "::set-env name=PATH::/usr/local/opt/gettext/bin:$PATH"
     - name: Versions
       run: |