diff options
| author | metagn <metagngn@gmail.com> | 2022-09-03 10:52:13 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-03 09:52:13 +0200 |
| commit | 86f7f4ffa5b8d84cbff12afbcd9b88d3ceb429c8 (patch) | |
| tree | a33f6930efe6342f9e4a9bb4b72c12f68213005e /testament | |
| parent | f540fd5cde268d2ecd1e22a20cac0879bf405f85 (diff) | |
| download | Nim-86f7f4ffa5b8d84cbff12afbcd9b88d3ceb429c8.tar.gz | |
remove deprecated type pragma syntax, fix bugs that required it (#20199)
* remove deprecated pragma syntax from 0.20.0 closes #4651, closes #16653 with a cheap fix for now due to how early `tfFinal` is set * remove type pragma between name and generics * undo removal, try removing bind expression (0.8.14) * fix test, unremove bind expr * remove again * Update changelog.md Co-authored-by: konsumlamm <44230978+konsumlamm@users.noreply.github.com> * dependencies @ HEAD & weave test dependencies * try fix package ci Co-authored-by: konsumlamm <44230978+konsumlamm@users.noreply.github.com>
Diffstat (limited to 'testament')
| -rw-r--r-- | testament/categories.nim | 7 | ||||
| -rw-r--r-- | testament/important_packages.nim | 8 |
2 files changed, 9 insertions, 6 deletions
diff --git a/testament/categories.nim b/testament/categories.nim index 43ea9f0ee..612f5287f 100644 --- a/testament/categories.nim +++ b/testament/categories.nim @@ -13,7 +13,7 @@ # included from testament.nim import important_packages -import std/strformat +import std/[strformat, strutils] from std/sequtils import filterIt const @@ -448,7 +448,10 @@ proc testNimblePackages(r: var TResults; cat: Category; packageFilter: string) = let describeOutput = tryCommand("git describe --tags --abbrev=0") discard tryCommand("git checkout $#" % [describeOutput.strip.quoteShell]) discard tryCommand("nimble install --depsOnly -y", maxRetries = 3) - discard tryCommand(pkg.cmd, reFailed = reBuildFailed) + let cmds = pkg.cmd.split(';') + for i in 0 ..< cmds.len - 1: + discard tryCommand(cmds[i], maxRetries = 3) + discard tryCommand(cmds[^1], reFailed = reBuildFailed) inc r.passed r.addResult(test, targetC, "", "", "", reSuccess, allowFailure = pkg.allowFailure) diff --git a/testament/important_packages.nim b/testament/important_packages.nim index c8fb5ad3c..e9b06754d 100644 --- a/testament/important_packages.nim +++ b/testament/important_packages.nim @@ -98,18 +98,18 @@ pkg "nicy", "nim c -r src/nicy.nim" pkg "nigui", "nim c -o:niguii -r src/nigui.nim" pkg "nimcrypto", "nim r --path:. tests/testall.nim" # `--path:.` workaround needed, see D20210308T165435 pkg "NimData", "nim c -o:nimdataa src/nimdata.nim" -pkg "nimes", "nim c src/nimes.nim" +pkg "nimes", "nimble install -y sdl2@#HEAD;nim c src/nimes.nim" pkg "nimfp", "nim c -o:nfp -r src/fp.nim" pkg "nimgame2", "nim c nimgame2/nimgame.nim" # XXX Doesn't work with deprecated 'randomize', will create a PR. pkg "nimgen", "nim c -o:nimgenn -r src/nimgen/runcfg.nim" -pkg "nimlsp" +pkg "nimlsp", allowFailure = true # dependency on ast_pattern_matching pkg "nimly", "nim c -r tests/test_readme_example.nim" pkg "nimongo", "nimble test_ci", allowFailure = true pkg "nimph", "nimble test", "https://github.com/disruptek/nimph", allowFailure = true pkg "nimpy", "nim c -r tests/nimfrompy.nim" pkg "nimquery" -pkg "nimsl" +pkg "nimsl", "nimble install -y variant@#HEAD;nimble test" pkg "nimsvg" pkg "nimterop", "nimble minitest" pkg "nimwc", "nim c nimwc.nim" @@ -157,7 +157,7 @@ pkg "tiny_sqlite" pkg "unicodedb", "nim c -d:release -r tests/tests.nim" pkg "unicodeplus", "nim c -d:release -r tests/tests.nim" pkg "unpack" -pkg "weave", "nimble test_gc_arc" +pkg "weave", "nimble install -y cligen synthesis;nimble test_gc_arc" pkg "websocket", "nim c websocket.nim" pkg "winim", "nim c winim.nim" pkg "with" |