update ci.yml to account for arm64 macos (#92)
This commit is contained in:
parent
4afb052662
commit
f726d5d411
|
@ -18,17 +18,24 @@ jobs:
|
|||
cpu: i386
|
||||
- os: macos
|
||||
cpu: amd64
|
||||
- os: macos
|
||||
cpu: arm64
|
||||
- os: windows
|
||||
cpu: amd64
|
||||
- os: windows
|
||||
cpu: i386
|
||||
branch: [version-1-6, version-2-0, devel]
|
||||
branch: [version-1-6, version-2-0, version-2-2, devel]
|
||||
include:
|
||||
- target:
|
||||
os: linux
|
||||
builder: ubuntu-latest
|
||||
- target:
|
||||
os: macos
|
||||
cpu: amd64
|
||||
builder: macos-13
|
||||
- target:
|
||||
os: macos
|
||||
cpu: arm64
|
||||
builder: macos-latest
|
||||
- target:
|
||||
os: windows
|
||||
|
@ -42,7 +49,7 @@ jobs:
|
|||
runs-on: ${{ matrix.builder }}
|
||||
steps:
|
||||
- name: Checkout
|
||||
uses: actions/checkout@v3
|
||||
uses: actions/checkout@v4
|
||||
|
||||
- name: Install build dependencies (Linux i386)
|
||||
if: runner.os == 'Linux' && matrix.target.cpu == 'i386'
|
||||
|
@ -67,7 +74,7 @@ jobs:
|
|||
- name: Restore llvm-mingw (Windows) from cache
|
||||
if: runner.os == 'Windows'
|
||||
id: windows-mingw-cache
|
||||
uses: actions/cache@v3
|
||||
uses: actions/cache@v4
|
||||
with:
|
||||
path: external/mingw-${{ matrix.target.cpu }}
|
||||
key: 'mingw-llvm-17-${{ matrix.target.cpu }}'
|
||||
|
@ -93,7 +100,7 @@ jobs:
|
|||
- name: Restore Nim DLLs dependencies (Windows) from cache
|
||||
if: runner.os == 'Windows'
|
||||
id: windows-dlls-cache
|
||||
uses: actions/cache@v3
|
||||
uses: actions/cache@v4
|
||||
with:
|
||||
path: external/dlls
|
||||
key: 'dlls'
|
||||
|
@ -118,6 +125,8 @@ jobs:
|
|||
run: |
|
||||
if [[ '${{ matrix.target.cpu }}' == 'amd64' ]]; then
|
||||
PLATFORM=x64
|
||||
elif [[ '${{ matrix.target.cpu }}' == 'arm64' ]]; then
|
||||
PLATFORM=arm64
|
||||
else
|
||||
PLATFORM=x86
|
||||
fi
|
||||
|
|
Loading…
Reference in New Issue