From ed697bd040132ba7425b3c38552b394abc40c6b6 Mon Sep 17 00:00:00 2001
From: John Cupitt <jcupitt@gmail.com>
Date: Fri, 23 Jul 2021 13:57:47 +0100
Subject: [PATCH] try to fix m1 build

---
 .github/workflows/ci.yml | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 73bebd87..2dd4ea30 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -13,10 +13,9 @@ jobs:
         name: [ "Linux x64 (Ubuntu 20.04) - GCC 10" ]
         os: [ ubuntu-20.04 ]
         sanitize: [ false ]
-        # overridden below for m1
         shell: /bin/bash
         build:
-          - { cc: gcc, cxx: g++, linker: ld }
+          - { cc: gcc, cxx: g++, linker: ld, shell: /bin/bash }
         include:
           - name: "Linux x64 (Ubuntu 20.04) - Clang 10 with ASan and UBSan"
             os: ubuntu-20.04
@@ -29,13 +28,11 @@ jobs:
           - name: "macOS (10.15) - Xcode 12.3 - M1"
             os: macos-m1
             sanitize: false
-            build: { cc: clang, cxx: clang++, linker: ld.lld }
-            # disable rosetta on M1
-            shell: /usr/bin/arch -arch arm64e /bin/bash -l {0}
+            build: { cc: clang, cxx: clang++, linker: ld.lld, shell: /usr/bin/arch -arch arm64e /bin/bash -l {0} }
 
     defaults:
       run:
-        shell: ${{ matrix.shell }} 
+        shell: ${{ matrix.build.shell }} 
 
     steps:
       - name: Checkout code