From cb640db2cd66d7f4a1810a7df51b55f6f59cf3c5 Mon Sep 17 00:00:00 2001
From: Miran <narimiran@disroot.org>
Date: Mon, 1 Jul 2024 18:06:47 +0200
Subject: [PATCH] update ci.yml and be more explicit in .nimble (#104)

---
 .github/workflows/ci.yml | 25 +++++++++++++++----------
 confutils.nimble         |  7 +++----
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index be6ce5e..dbab2b4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -22,25 +22,32 @@ 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]
         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
-            builder: windows-2019
+            builder: windows-latest
             shell: msys2 {0}
 
+
     defaults:
       run:
         shell: ${{ matrix.shell }}
@@ -120,6 +127,8 @@ jobs:
         run: |
           if [[ '${{ matrix.target.cpu }}' == 'amd64' ]]; then
             PLATFORM=x64
+          elif [[ '${{ matrix.target.cpu }}' == 'arm64' ]]; then
+            PLATFORM=arm64
           else
             PLATFORM=x86
           fi
@@ -158,8 +167,4 @@ jobs:
           nimble install -y --depsOnly
           nimble install -y toml_serialization json_serialization unittest2
           rm -f nimble.lock
-          env NIMFLAGS="${NIMFLAGS} --mm:refc" nimble test
-          if [[ ${{matrix.branch}} == "devel" ]]; then
-            echo -e "\nTesting with '--mm:orc':\n"
-            env NIMFLAGS="${NIMFLAGS} --mm:orc" nimble test
-          fi
+          nimble test
diff --git a/confutils.nimble b/confutils.nimble
index 42bd49b..452a0c9 100644
--- a/confutils.nimble
+++ b/confutils.nimble
@@ -35,9 +35,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"]:
@@ -47,9 +47,8 @@ task test, "Run all tests":
   #Also iterate over every test in tests/fail, and verify they fail to compile.
   echo "\r\nTest Fail to Compile:"
   for path in listFiles(thisDir() / "tests" / "fail"):
-    if path.split(".")[^1] != "nim":
+    if not path.endsWith(".nim"):
       continue
-
     if gorgeEx(nimc & " " & lang & " " & flags & " " & path).exitCode != 0:
       echo "  [OK] ", path.split(DirSep)[^1]
     else: