From 48cb4b9ec8a46521ba28ed849965ddf765b0f1c0 Mon Sep 17 00:00:00 2001 From: narimiran Date: Thu, 17 Oct 2024 09:18:31 +0200 Subject: [PATCH 1/2] update ci.yml to account for arm64 macos --- .github/workflows/ci.yml | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 4b8824b..9101e2a 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -7,7 +7,7 @@ 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 @@ -15,6 +15,8 @@ jobs: cpu: i386 - os: macos cpu: amd64 + - os: macos + cpu: arm64 - os: windows cpu: amd64 - os: windows @@ -25,6 +27,11 @@ jobs: builder: ubuntu-latest - target: os: macos + cpu: amd64 + builder: macos-13 + - target: + os: macos + cpu: arm64 builder: macos-latest - target: os: windows @@ -38,7 +45,7 @@ jobs: runs-on: ${{ matrix.builder }} steps: - name: Git checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 with: submodules: true @@ -65,7 +72,7 @@ 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 }}' @@ -73,7 +80,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-${{ matrix.target.cpu }} key: 'dlls-${{ matrix.target.cpu }}' @@ -123,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 }}' @@ -132,6 +139,8 @@ jobs: run: | if [[ '${{ matrix.target.cpu }}' == 'amd64' ]]; then PLATFORM=x64 + elif [[ '${{ matrix.target.cpu }}' == 'arm64' ]]; then + PLATFORM=arm64 else PLATFORM=x86 fi From d8d82ab6b879d26eff90b8e693c2911d3d3743f7 Mon Sep 17 00:00:00 2001 From: narimiran Date: Wed, 23 Oct 2024 12:03:20 +0200 Subject: [PATCH 2/2] use `refc` --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 468b153..116d48e 100644 --- a/Makefile +++ b/Makefile @@ -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."