Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update ci.yml to account for arm64 macos #48

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,16 @@ jobs:
fail-fast: false
max-parallel: 20
matrix:
branch: [version-1-6, version-2-0]
branch: [version-1-6, version-2-0, version-2-2, devel]
target:
- os: linux
cpu: amd64
- os: linux
cpu: i386
- os: macos
cpu: amd64
- os: macos
cpu: arm64
- os: windows
cpu: amd64
- os: windows
Expand All @@ -27,6 +29,10 @@ jobs:
os: macos
cpu: amd64
builder: macos-13
- target:
os: macos
cpu: arm64
builder: macos-latest
- target:
os: windows
builder: windows-latest
Expand All @@ -39,7 +45,7 @@ jobs:
runs-on: ${{ matrix.builder }}
steps:
- name: Git checkout
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
submodules: true

Expand All @@ -66,15 +72,15 @@ jobs:
- name: Restore MinGW-W64 (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: 'llvm-mingw-17-${{ matrix.target.cpu }}'

- 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-${{ matrix.target.cpu }}
key: 'dlls-${{ matrix.target.cpu }}'
Expand Down Expand Up @@ -124,7 +130,7 @@ jobs:

- name: Restore prebuilt Nim from cache
id: nim-cache
uses: actions/cache@v3
uses: actions/cache@v4
with:
path: NimBinaries
key: '${{ matrix.target.os }}-${{ matrix.target.cpu }}-${{ steps.versions.outputs.nimbus_build_system }}'
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

SHELL := bash # the shell used internally by Make

NIM_PARAMS := -f --outdir:build --skipParentCfg:on --skipUserCfg:on $(NIMFLAGS)
NIM_PARAMS := -f --gc:refc --outdir:build --skipParentCfg:on --skipUserCfg:on $(NIMFLAGS)
BUILD_MSG := "\\x1B[92mBuilding:\\x1B[39m"
CMAKE := cmake
CMAKE_MISSING_MSG := "CMake not installed. Aborting."
Expand Down
Loading