diff options
author | Timothee Cour <timothee.cour2@gmail.com> | 2021-04-23 22:54:31 -0700 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-04-24 07:54:31 +0200 |
commit | b667e288e27a09ce4f65166fc66a6b713350a9b6 (patch) | |
tree | 547cd716f3f3e3a3d91083c1c3d6cb32ad4c1789 | |
parent | 80df21d9a368b0ad40f6c36b898861e75926b732 (diff) | |
download | Nim-b667e288e27a09ce4f65166fc66a6b713350a9b6.tar.gz |
move travis, appveyor, ci.yml.disabled to `unmaintained/` (#17828)
* move travis, appveyor, ci.yml.disabled to unmaintained * update some mentions of travis, appevyor * fix test
-rw-r--r-- | changelog.md | 2 | ||||
-rw-r--r-- | doc/contributing.rst | 4 | ||||
-rw-r--r-- | testament/specs.nim | 4 | ||||
-rw-r--r-- | tests/async/tasyncdial.nim | 1 | ||||
-rw-r--r-- | tests/stdlib/tmemlinesBuf.nim | 8 | ||||
-rw-r--r-- | tests/stdlib/tnetdial.nim | 1 | ||||
-rw-r--r-- | tests/system/talloc.nim | 6 | ||||
-rw-r--r-- | tests/system/talloc2.nim | 2 | ||||
-rw-r--r-- | unmaintained/.travis.yml (renamed from .travis.yml) | 0 | ||||
-rw-r--r-- | unmaintained/appveyor.yml (renamed from appveyor.yml.disabled) | 0 | ||||
-rw-r--r-- | unmaintained/ci.yml (renamed from .github/workflows/ci.yml.disabled) | 0 | ||||
-rw-r--r-- | unmaintained/readme.md | 11 |
12 files changed, 20 insertions, 19 deletions
diff --git a/changelog.md b/changelog.md index d7b568aa0..943b5d6df 100644 --- a/changelog.md +++ b/changelog.md @@ -57,6 +57,8 @@ - The unary slice `..b` was removed, use `0..b` instead or use `-d:nimLegacyUnarySlice` for a deprecation period. +- Moved `.travis.yml`, `appveyor.yml.disabled`, `.github/workflows/ci.yml.disabled` to `unmaintained/`. + ## Standard library additions and changes - Added support for parenthesized expressions in `strformat` diff --git a/doc/contributing.rst b/doc/contributing.rst index 81fa9f8eb..abc81dae6 100644 --- a/doc/contributing.rst +++ b/doc/contributing.rst @@ -155,7 +155,7 @@ To run a single test: ./koch test run tests/stdlib/tos.nim # can also provide relative path For reproducible tests (to reproduce an environment more similar to the one -run by Continuous Integration on travis/appveyor), you may want to disable your +run by Continuous Integration on github actions/azure pipelines), you may want to disable your local configuration (e.g. in ``~/.config/nim/nim.cfg``) which may affect some tests; this can also be achieved by using `export XDG_CONFIG_HOME=pathtoAlternateConfig`:cmd: before running `./koch`:cmd: @@ -517,7 +517,7 @@ Continuous Integration (CI) the CI pipeline and affects other PR's; if you don't need it (e.g. for WIP or documentation only changes), add ``[skip ci]`` to your commit message title. This convention is supported by our github actions pipelines and our azure pipeline - as well as our former other pipelines: + (using custom logic, which should complete in < 1mn) as well as our former other pipelines: `Appveyor <https://www.appveyor.com/docs/how-to/filtering-commits/#skip-directive-in-commit-message>`_ and `Travis <https://docs.travis-ci.com/user/customizing-the-build/#skipping-a-build>`_. diff --git a/testament/specs.nim b/testament/specs.nim index 043f14ed3..38e4ed0db 100644 --- a/testament/specs.nim +++ b/testament/specs.nim @@ -328,9 +328,9 @@ proc parseSpec*(filename: string): TSpec = when defined(unix): result.err = reDisabled of "posix": when defined(posix): result.err = reDisabled - of "travis": + of "travis": # deprecated if isTravis: result.err = reDisabled - of "appveyor": + of "appveyor": # deprecated if isAppVeyor: result.err = reDisabled of "azure": if isAzure: result.err = reDisabled diff --git a/tests/async/tasyncdial.nim b/tests/async/tasyncdial.nim index a755de74e..f0377dfd5 100644 --- a/tests/async/tasyncdial.nim +++ b/tests/async/tasyncdial.nim @@ -3,7 +3,6 @@ discard """ OK AF_INET OK AF_INET6 ''' - disabled: "travis" """ import diff --git a/tests/stdlib/tmemlinesBuf.nim b/tests/stdlib/tmemlinesBuf.nim index ea607525d..3f0bd5182 100644 --- a/tests/stdlib/tmemlinesBuf.nim +++ b/tests/stdlib/tmemlinesBuf.nim @@ -1,8 +1,3 @@ -discard """ -output: "15" -disabled: "appveyor" -""" - import memfiles var inp = memfiles.open("tests/stdlib/tmemlinesBuf.nim") var buffer: string = "" @@ -11,5 +6,4 @@ for line in lines(inp, buffer): lineCount += 1 close(inp) - -echo lineCount +doAssert lineCount == 9, $lineCount # this file's number of lines diff --git a/tests/stdlib/tnetdial.nim b/tests/stdlib/tnetdial.nim index f940bd630..3de00ff99 100644 --- a/tests/stdlib/tnetdial.nim +++ b/tests/stdlib/tnetdial.nim @@ -2,7 +2,6 @@ discard """ cmd: "nim c --threads:on $file" exitcode: 0 output: "OK" - disabled: "travis" """ import os, net, nativesockets, asyncdispatch diff --git a/tests/system/talloc.nim b/tests/system/talloc.nim index 9b970fda0..a81fef481 100644 --- a/tests/system/talloc.nim +++ b/tests/system/talloc.nim @@ -1,8 +1,4 @@ -discard """ -disabled: "appveyor" -""" - -# appveyor is "out of memory" +# was: appveyor is "out of memory" var x: ptr int diff --git a/tests/system/talloc2.nim b/tests/system/talloc2.nim index c498a3f4b..9d1687f34 100644 --- a/tests/system/talloc2.nim +++ b/tests/system/talloc2.nim @@ -5,7 +5,7 @@ joinable: false disabled: 32bit """ # no point to test this on system with smaller address space -# appveyor is "out of memory" +# was: appveyor is "out of memory" const nmax = 2*1024*1024*1024 diff --git a/.travis.yml b/unmaintained/.travis.yml index 13e5d151a..13e5d151a 100644 --- a/.travis.yml +++ b/unmaintained/.travis.yml diff --git a/appveyor.yml.disabled b/unmaintained/appveyor.yml index b13c5d909..b13c5d909 100644 --- a/appveyor.yml.disabled +++ b/unmaintained/appveyor.yml diff --git a/.github/workflows/ci.yml.disabled b/unmaintained/ci.yml index 62daf875a..62daf875a 100644 --- a/.github/workflows/ci.yml.disabled +++ b/unmaintained/ci.yml diff --git a/unmaintained/readme.md b/unmaintained/readme.md new file mode 100644 index 000000000..cddb15cd2 --- /dev/null +++ b/unmaintained/readme.md @@ -0,0 +1,11 @@ +Deprecated, unused and unmaintained files can be moved here when they have some value, +e.g. if someone want to revive them in their project or in this repo. If a deprecated and unused file +is redundant, it should just be removed instead. + +See also https://github.com/nim-lang/graveyard, which is maintained on a best effort basis +and has different goals. + +## table of contents +.travis.yml -> unmaintained/.travis.yml +appveyor.yml.disabled -> unmaintained/appveyor.yml +.github/workflows/ci.yml.disabled -> unmaintained/ci.yml |