Skip to content

Commit 69d6764

Browse files
committed
ci: enable M1 runners for CI job
1 parent 31c187b commit 69d6764

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

.github/workflows/ci.yml

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ jobs:
2525
container: "{\"image\": \"elopeztob/alpine-haskell-stack-echidna:9.2.7\", \"options\": \"--user 1001\"}"
2626
- os: macos-latest
2727
shell: bash
28+
- os: macos-latest-xlarge
29+
shell: bash
2830
- os: windows-latest
2931
shell: msys2 {0}
3032

@@ -35,7 +37,7 @@ jobs:
3537
steps:
3638
- name: Get Packages (macOS)
3739
if: runner.os == 'macOS'
38-
run: brew install automake
40+
run: brew install autoconf automake gmp libtool
3941

4042
- name: Get Packages (Windows)
4143
uses: msys2/setup-msys2@v2
@@ -59,7 +61,7 @@ jobs:
5961
openssl:p
6062
6163
- name: Install Stack
62-
uses: haskell/actions/setup@v2
64+
uses: haskell-actions/setup@v2
6365
id: stack
6466
if: matrix.container == ''
6567
with:
@@ -76,7 +78,7 @@ jobs:
7678
path: |
7779
~/.local
7880
D:\a\_temp\msys64\home\runneradmin\.local
79-
key: ${{ runner.os }}-local-${{ env.CACHE_VERSION }}-${{ hashFiles('.github/scripts/install-*') }}
81+
key: ${{ runner.os }}-${{ runner.arch }}-local-${{ env.CACHE_VERSION }}-${{ hashFiles('.github/scripts/install-*') }}
8082

8183
- name: Cache Stack & Cabal
8284
uses: actions/cache@v3
@@ -87,7 +89,7 @@ jobs:
8789
${{ steps.stack.outputs.stack-root || '~/.stack' }}/*
8890
!${{ steps.stack.outputs.stack-root || '~/.stack' }}/pantry/hackage/*.tar
8991
!${{ steps.stack.outputs.stack-root || '~/.stack' }}/pantry/hackage/*.tar.gz
90-
key: ${{ runner.os }}-stack-${{ env.CACHE_VERSION }}-${{ hashFiles('package.yaml', 'stack.yaml') }}
92+
key: ${{ runner.os }}-${{ runner.arch }}-stack-${{ env.CACHE_VERSION }}-${{ hashFiles('package.yaml', 'stack.yaml') }}
9193

9294
- name: Build Libraries
9395
run: |
@@ -119,7 +121,7 @@ jobs:
119121
- name: Upload artifact
120122
uses: actions/upload-artifact@v3
121123
with:
122-
name: echidna-${{ runner.os }}
124+
name: echidna-${{ runner.os }}-${{ runner.arch }}
123125
path: echidna.tar.gz
124126

125127
- name: Build and copy test suite

0 commit comments

Comments
 (0)