update ci.yml and be more explicit in .nimble (#82)

status-im · Jun 26, 2024 · 5f5e0f8 · 5f5e0f8
1 parent 2e29df0
commit 5f5e0f8
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 6 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -22,21 +22,29 @@ 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
+              cpu: amd64
+            builder: macos-13
             shell: bash
           - target:
               os: macos
-            builder: macos-12
+              cpu: arm64
+            builder: macos-latest
             shell: bash
           - target:
               os: windows
-            builder: windows-2019
+            builder: windows-latest
             shell: msys2 {0}
 
     defaults:
@@ -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/metrics.nimble b/metrics.nimble
@@ -10,6 +10,7 @@ skipDirs      = @["tests", "benchmarks"]
 ### Dependencies
 requires "nim >= 1.6.14",
          "chronos >= 3.2.0",
+         "results",
          "stew"
 
 let nimc = getEnv("NIMC", "nim") # Which nim compiler to use
@@ -30,9 +31,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
 
 ### tasks
 task test, "Main tests":

diff --git a/metrics/chronos_httpserver.nim b/metrics/chronos_httpserver.nim
@@ -13,7 +13,7 @@
 when defined(nimHasUsed):
   {.used.}
 
-import stew/results
+import results
 import chronos, chronos/apps/http/httpserver
 export chronos, results