From 6ae68b9113a8782d962e7564d87c4c556a6bbdb7 Mon Sep 17 00:00:00 2001 From: John Cupitt Date: Fri, 23 Jul 2021 13:55:04 +0100 Subject: [PATCH] another try at a workflow for m1 --- .github/workflows/ci.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5a3455be..73bebd87 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,6 +13,8 @@ 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 } include: @@ -28,12 +30,12 @@ jobs: 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} - # disable rosetta on M1 defaults: - if: contains(matrix.os, 'm1') run: - shell: /usr/bin/arch -arch arm64e /bin/bash -l {0} + shell: ${{ matrix.shell }} steps: - name: Checkout code