From a3d18775bf8b78226930f7ca0baf75b7263bef44 Mon Sep 17 00:00:00 2001
From: Gregory Oschwald <goschwald@maxmind.com>
Date: Tue, 30 Apr 2024 08:54:22 -0700
Subject: [PATCH] Use simpler workaround for Homebrew directory change

---
 .github/workflows/test-libmaxminddb.yml | 31 ++++++-------------------
 1 file changed, 7 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/test-libmaxminddb.yml b/.github/workflows/test-libmaxminddb.yml
index bfe298b..9640a56 100644
--- a/.github/workflows/test-libmaxminddb.yml
+++ b/.github/workflows/test-libmaxminddb.yml
@@ -44,36 +44,19 @@ jobs:
         run: sudo apt install libmaxminddb-dev
         if: matrix.platform == 'ubuntu-latest'
 
+      - name: "Work around macos arm64 homebrew directory changes"
+        if: runner.os == 'macos' and runner.arch = 'arm64'
+        run: |
+          echo "CFLAGS=-I/opt/homebrew/include" >> $env:GITHUB_ENV
+          echo "LDFLAGS=-L/opt/homebrew/lib" >> $env:GITHUB_ENV
+
       - name: Install libmaxminddb
         run: brew install libmaxminddb && brew ls --verbose libmaxminddb
-        if: matrix.platform == 'macos-latest'
 
       - name: Build with Werror and Wall (not macOS)
         run: python setup.py build
-        if: matrix.platform != 'macos-latest'
         env:
-          CFLAGS: "-Werror -Wall -Wextra"
+          CFLAGS: "${{ env.CFLAGS }} -Werror -Wall -Wextra"
 
       - name: Test with tox (system libmaxminddb)
         run: tox
-        if: matrix.platform != 'macos-latest'
-
-      # Starting at the end of April 2024, the homebrew include and lib
-      # directories were not properly set up in the flags for the GitHub
-      # images. I looked for an issue both in Homebrew and actions/runner-images
-      # and did not find one or similar reports from other users. Setting
-      # them here seemed easier than digging into it further. It would
-      # probably be worth trying to remove this in the future.
-      - name: Build with Werror and Wall (macOS)
-        run: python setup.py build
-        if: matrix.platform == 'macos-latest'
-        env:
-          CFLAGS: "-Werror -Wall -Wextra -I/opt/homebrew/include"
-          LDFLAGS: "-L/opt/homebrew/lib"
-
-      - name: Test with tox (system libmaxminddb)
-        run: tox
-        if: matrix.platform == 'macos-latest'
-        env:
-          CFLAGS: "-I/opt/homebrew/include"
-          LDFLAGS: "-L/opt/homebrew/lib"