From f505d32950ba3d7b2a6af7d234bf30cbcc058ed3 Mon Sep 17 00:00:00 2001
From: Jaremy Creechley <creechley@gmail.com>
Date: Wed, 12 Jul 2023 18:58:31 -0700
Subject: [PATCH] rework nimble tests

---
 .github/workflows/ci.yml | 29 +++++++++--------------------
 config.nims              |  9 +++++----
 2 files changed, 14 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 080738d..3d88df3 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -105,20 +105,11 @@ jobs:
           echo "ncpu=$ncpu" >> $GITHUB_ENV
           echo "MAKE_CMD=${MAKE_CMD}" >> $GITHUB_ENV
 
-      - uses: jiro4989/setup-nim-action@v1
+      - name: Setup Nimble
+        uses: "./.github/actions/install_nimble"
         with:
-          nim-version: 1.6.14
-          repo-token: ${{ secrets.GITHUB_TOKEN }}
-
-      # - name: Setup Paths
-      #   run: |
-      #     echo 'NIMBLE_DIR=${{ github.workspace }}/.nimble' >> $GITHUB_ENV
-
-      # - name: Setup Nimble
-      #   uses: "./.github/actions/install_nimble"
-      #   with:
-      #     os: ${{ matrix.target.os }}
-      #     cpu: ${{ matrix.target.cpu }}
+          os: ${{ matrix.target.os }}
+          cpu: ${{ matrix.target.cpu }}
 
       - name: Restore nimble dependencies from cache
         id: nimble_deps
@@ -128,16 +119,14 @@ jobs:
             ${{ github.workspace }} / .nimble
           key: ${{ matrix.target.os }}-${{ matrix.target.cpu }}-dotnimble-${{ hashFiles('nimble.lock') }}
 
-      - name: Check ENV
+      - name: Setup Env
         run: |
-          echo ENV:
-          env
-
-          nim -v
           nimble -v
 
-          nimble install -y nimble@0.14.2
-          nimble -v
+      - name: Setup Deps
+        run: |
+          nimble install -d
+          nimble setup
 
       - name: Run tests
         run: |
diff --git a/config.nims b/config.nims
index 81f7fef..a8dac2e 100644
--- a/config.nims
+++ b/config.nims
@@ -18,8 +18,9 @@ when getEnv("NIMBUS_BUILD_SYSTEM") == "yes" and
     system.fileExists(currentDir & "nimbus-build-system.paths"):
   echo "Using Nimbus Paths"
   include "nimbus-build-system.paths"
-elif fileExists("nimble.paths"):
+
+# begin Nimble config (version 2)
+when withDir(thisDir(), system.fileExists("nimble.paths")):
+  --noNimblePath
   echo "Using Nimble Paths"
-  # begin Nimble config (version 1)
-  include "nimble.paths"
-  # end Nimble config
+# end Nimble config