rework nimble tests

This commit is contained in:
Jaremy Creechley 2023-07-12 18:58:31 -07:00
parent d4db3d8e27
commit f505d32950
No known key found for this signature in database
GPG Key ID: 4E66FB67B21D3300
2 changed files with 14 additions and 24 deletions

View File

@ -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: |

View File

@ -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