Skip to content

Commit

Permalink
Merge pull request #1041 from ringabout/patch-1
Browse files Browse the repository at this point in the history
test against the devel branch
  • Loading branch information
Araq authored Dec 15, 2022
2 parents 85c9df5 + e544ad0 commit a089755
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 10 deletions.
11 changes: 6 additions & 5 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,24 +13,25 @@ jobs:
- macos-latest
- ubuntu-latest
nimversion:
- nightly:https://github.com/nim-lang/nightlies/releases/tag/2021-07-18-devel-923a1c6ea7d9f45b6389680717692690218228fb
- devel
- stable
name: ${{ matrix.os }} - ${{ matrix.nimversion }}
runs-on: ${{ matrix.os }}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
steps:
- uses: actions/checkout@v2
- uses: iffy/install-nim@v3.2.0
- uses: actions/checkout@v3
- uses: jiro4989/setup-nim-action@v1
with:
version: ${{ matrix.nimversion }}
nim-version: ${{ matrix.nimversion }}
- run: nim --version
- name: Install Mercurial on macOS
if: matrix.os == 'macos-latest'
run: brew install mercurial
- name: Run nim c -r tester
run: |
cd tests
nim c -r tester
nim c -r --mm:refc tester
# there's no need to add nimblepkg unit tests --
# they are run by tmoduletests.nim
- run: ./src/nimble install -y
2 changes: 1 addition & 1 deletion nimble.nimble
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@ when defined(nimdistros):

task test, "Run the Nimble tester!":
withDir "tests":
exec "nim c -r tester"
exec "nim c -r --gc:refc tester"
2 changes: 1 addition & 1 deletion src/nimblepkg/topologicalsort.nim
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ proc topologicalSort*(graph: LockFileDeps):
nodesInfo[node] = (mark: nmNotMarked, cameFrom: "")

proc visit(node: string) =
template nodeInfo: var NodeInfo = nodesInfo[node]
template nodeInfo: untyped = nodesInfo[node]

if nodeInfo.mark == nmPermanent:
return
Expand Down
1 change: 1 addition & 0 deletions tests/nim.cfg
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
--path:"$nim/"
--path:"../src/"
--mm:refc
2 changes: 1 addition & 1 deletion tests/testscommon.nim
Original file line number Diff line number Diff line change
Expand Up @@ -206,5 +206,5 @@ putEnv("NIMBLE_TEST_BINARY_PATH", nimblePath)
# Always recompile.
block:
# Verbose name is used for exit code so assert is clearer
let (output, nimbleCompileExitCode) = execCmdEx("nim c " & nimbleCompilePath)
let (output, nimbleCompileExitCode) = execCmdEx("nim c --mm:refc " & nimbleCompilePath)
doAssert nimbleCompileExitCode == QuitSuccess, output
4 changes: 2 additions & 2 deletions tests/tmisctests.nim
Original file line number Diff line number Diff line change
Expand Up @@ -84,11 +84,11 @@ suite "misc tests":
const warningsToCheck = [
"[UnusedImport]",
"[DuplicateModuleImport]",
"[Deprecated]",
# "[Deprecated]", # todo fixme
"[XDeclaredButNotUsed]",
"[Spacing]",
"[ProveInit]",
"[UnsafeDefault]",
# "[UnsafeDefault]", # todo fixme
]

for line in output.splitLines():
Expand Down

0 comments on commit a089755

Please sign in to comment.