From ba87bbfdcb957e63a49e51bda4183a7f5ac86b08 Mon Sep 17 00:00:00 2001
From: swryan <swryan@users.noreply.github.com>
Date: Mon, 3 Jun 2024 11:18:40 -0400
Subject: [PATCH 1/2] don't install gettext

---
 .github/workflows/test_workflow.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/test_workflow.yml b/.github/workflows/test_workflow.yml
index e043b8c..d4ea589 100644
--- a/.github/workflows/test_workflow.yml
+++ b/.github/workflows/test_workflow.yml
@@ -344,7 +344,6 @@ jobs:
       - name: Run tests
         run: |
           python -m pip install testflo parameterized six
-          conda install -y -q gettext
 
           echo "============================================================="
           echo "Run tests from pyoptsparse repository"

From 370b799aab0a9e80aed33fd2360cdf730d72ea31 Mon Sep 17 00:00:00 2001
From: swryan <swryan@users.noreply.github.com>
Date: Tue, 4 Jun 2024 09:47:14 -0400
Subject: [PATCH 2/2] add MacOS ARM support to test workflow

---
 .github/workflows/test_workflow.yml | 50 +++++++++++++++++++++--------
 1 file changed, 37 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/test_workflow.yml b/.github/workflows/test_workflow.yml
index d4ea589..1676f75 100644
--- a/.github/workflows/test_workflow.yml
+++ b/.github/workflows/test_workflow.yml
@@ -81,7 +81,7 @@ jobs:
             SCIPY: '1.13'
             MPICC: 4
             PYOPTSPARSE: 'default'
-            PAROPT: true
+            # PAROPT: true
             SNOPT: 7.7
 
           # test latest versions
@@ -136,15 +136,15 @@ jobs:
             FORCE_BUILD: true
 
           # test baseline versions on MacOS latest (ARM64)
-          # - NAME: MacOS Baseline on ARM
-          #   OS: macos-latest
-          #   PY: '3.12'
-          #   NUMPY: '1.26'
-          #   SCIPY: '1.13'
-          #   MPI4PY: true
-          #   PYOPTSPARSE: 'default'
-          #   PAROPT: true
-          #   SNOPT: 7.7
+          - NAME: MacOS Baseline on ARM
+            OS: macos-latest
+            PY: '3.12'
+            NUMPY: '1.26'
+            SCIPY: '1.13'
+            BREW: true
+            MPICC: 4
+            PYOPTSPARSE: 'default'
+            SNOPT: 7.7
 
     runs-on: ${{ matrix.OS }}
 
@@ -195,7 +195,13 @@ jobs:
 
       - name: Install
         run: |
-          conda install numpy=${{ matrix.NUMPY }} scipy=${{ matrix.SCIPY }} compilers cython swig -q -y
+          conda install numpy=${{ matrix.NUMPY }} scipy=${{ matrix.SCIPY }} -q -y
+
+          if [[ "${{ matrix.BREW }}" ]]; then
+            brew install swig gcc meson
+          else
+            conda install compilers cython swig -q -y
+          fi
 
           echo "============================================================="
           echo "Install build_pyoptsparse"
@@ -209,7 +215,11 @@ jobs:
           echo "Install MPI"
           echo "============================================================="
 
-          conda install openmpi-mpicc=${{ matrix.MPICC }} mpi4py -q -y
+          if [[ "${{ matrix.BREW }}" ]]; then
+            brew install open-mpi mpi4py
+          else
+            conda install openmpi-mpicc=${{ matrix.MPICC }} mpi4py -q -y
+          fi
 
           echo "OMPI_MCA_rmaps_base_oversubscribe=1" >> $GITHUB_ENV
 
@@ -289,7 +299,7 @@ jobs:
           fi
 
           echo "build_pyoptsparse -v $BRANCH $FORCE_BUILD $PAROPT $SNOPT $NO_IPOPT $LINEAR_SOLVER"
-          build_pyoptsparse -v $BRANCH $FORCE_BUILD $PAROPT $SNOPT $NO_IPOPT $LINEAR_SOLVER
+          build_pyoptsparse -v $BRANCH $FORCE_BUILD $PAROPT $SNOPT $NO_IPOPT $LINEAR_SOLVER -d
 
           echo "BRANCH=${BRANCH}" >> $GITHUB_ENV
 
@@ -302,6 +312,20 @@ jobs:
             echo "============================================================="
             cat $f
           done
+          if test -d /private/var/folders; then
+            for f in $(find /private/var/folders/ -name 'meson-log.txt'); do
+              echo "============================================================="
+              echo $f
+              echo "============================================================="
+              cat $f
+            done
+            for f in $(find /private/var/folders/ -name 'compile.log'); do
+              echo "============================================================="
+              echo $f
+              echo "============================================================="
+              cat $f
+            done
+          fi
 
       # Enable tmate debugging of manually-triggered workflows if the input option was provided
       #