From 298a9554a885b2df59737bb3461aac8d0d339724 Mon Sep 17 00:00:00 2001 From: Miran Date: Wed, 26 Jun 2024 12:12:02 +0200 Subject: [PATCH] update ci.yml and be more explicit in .nimble (#72) --- .github/workflows/ci.yml | 14 ++++++++++++-- serialization.nimble | 4 ++-- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a34a425..9464323 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,17 +22,25 @@ jobs: cpu: i386 - os: macos cpu: amd64 + - os: macos + cpu: arm64 - os: windows cpu: amd64 branch: [version-1-6, version-2-0, devel] include: - target: os: linux - builder: ubuntu-20.04 + builder: ubuntu-latest shell: bash - target: os: macos - builder: macos-12 + cpu: amd64 + builder: macos-13 + shell: bash + - target: + os: macos + cpu: arm64 + builder: macos-latest shell: bash - target: os: windows @@ -118,6 +126,8 @@ jobs: run: | if [[ '${{ matrix.target.cpu }}' == 'amd64' ]]; then PLATFORM=x64 + elif [[ '${{ matrix.target.cpu }}' == 'arm64' ]]; then + PLATFORM=arm64 else PLATFORM=x86 fi diff --git a/serialization.nimble b/serialization.nimble index 4155b05..64a1ecb 100644 --- a/serialization.nimble +++ b/serialization.nimble @@ -26,9 +26,9 @@ proc build(args, path: string) = exec nimc & " " & lang & " " & cfg & " " & flags & " " & args & " " & path proc run(args, path: string) = - build args & " -r", path + build args & " --mm:refc -r", path if (NimMajor, NimMinor) > (1, 6): - build args & " --mm:refc -r", path + build args & " --mm:orc -r", path task test, "Run all tests": for threads in ["--threads:off", "--threads:on"]: