ilyakooo0/Idris-dev
1
0
Fork 0
mirror of https://github.com/ilyakooo0/Idris-dev.git synced 2024-08-16 12:10:39 +03:00
Code Issues Projects Releases Wiki Activity

Disable travis for GHC 8.8 (libffi still broken)

Browse Source 
Update changelog

Use GHC 8.8 in Appveyor

Run legacy test commands
This commit is contained in:
Niklas Larsson 2020-01-25 05:49:53 +01:00
parent b4dc55ed5e
commit 9662ab5e4a
19 changed files with 49 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
.travis.yml
View File

@ -1,5 +1,4 @@
dist: xenial
sudo: false
language: c
@ -21,15 +20,15 @@ matrix:
compiler: ": #GHC 8.2.2"
addons: {apt: {packages: [cabal-install-2.4,ghc-8.2.2,cppcheck,hscolour], sources: [hvr-ghc]}}
- env: CABALVER="3.0" GHCVER="8.8.1" TESTS="lib_doc doc"
compiler: ": #GHC 8.8.1"
addons: {apt: {packages: [cabal-install-3.0,ghc-8.8.1,cppcheck,hscolour], sources: [hvr-ghc]}}
- env: CABALVER="3.0" GHCVER="8.8.1" TESTS="test_js"
compiler: ": #GHC 8.8.1"
addons: {apt: {packages: [cabal-install-3.0,ghc-8.8.1,cppcheck,hscolour], sources: [hvr-ghc]}}
- env: CABALVER="3.0" GHCVER="8.8.1" TESTS="test_c"
compiler: ": #GHC 8.8.1"
addons: {apt: {packages: [cabal-install-3.0,ghc-8.8.1,cppcheck,hscolour], sources: [hvr-ghc]}}
# - env: CABALVER="3.0" GHCVER="8.8.1" TESTS="lib_doc doc"
# compiler: ": #GHC 8.8.1"
# addons: {apt: {packages: [cabal-install-3.0,ghc-8.8.1,cppcheck,hscolour], sources: [hvr-ghc]}}
# - env: CABALVER="3.0" GHCVER="8.8.1" TESTS="test_js"
# compiler: ": #GHC 8.8.1"
# addons: {apt: {packages: [cabal-install-3.0,ghc-8.8.1,cppcheck,hscolour], sources: [hvr-ghc]}}
# - env: CABALVER="3.0" GHCVER="8.8.1" TESTS="test_c"
# compiler: ": #GHC 8.8.1"
# addons: {apt: {packages: [cabal-install-3.0,ghc-8.8.1,cppcheck,hscolour], sources: [hvr-ghc]}}
fast-finish: true
cache:

3
CHANGELOG.md
View File

@ -1,3 +1,6 @@
# New since last release
+ Updated to work with GHC 8.8 and cabal 3.0
# New in 1.3.2
+ Documentation added to proof section

6
Makefile
View File

@ -30,15 +30,15 @@ stylize:
./stylize.sh
test_c:
$(CABAL) test $(ARGS) --test-options \
$(CABAL) v1-test $(ARGS) --test-options \
"$(TEST-ARGS) --rerun-update +RTS -N$(TEST-JOBS) -RTS"
test_js:
$(CABAL) test $(ARGS) --test-options \
$(CABAL) v1-test $(ARGS) --test-options \
"$(TEST-ARGS) --node --rerun-update +RTS -N$(TEST-JOBS) -RTS"
test_update:
$(CABAL) test $(ARGS) --test-options \
$(CABAL) v1-test $(ARGS) --test-options \
"$(TEST-ARGS) --accept +RTS -N$(TEST-JOBS) -RTS"
test_clean:

6
appveyor.yml
View File

@ -1,17 +1,17 @@
version: 1.0.{build}
init:
- ps: >-
choco install cabal --version=2.4.1.0 --no-progress
choco install cabal --no-progress
mkdir C:\ghc
Invoke-WebRequest "https://downloads.haskell.org/~ghc/8.4.3/ghc-8.4.3-x86_64-unknown-mingw32.tar.xz" -OutFile C:\ghc\ghc.tar.xz -UserAgent "Curl"
Invoke-WebRequest "https://downloads.haskell.org/~ghc/8.8.2/ghc-8.8.2-x86_64-unknown-mingw32.tar.xz" -OutFile C:\ghc\ghc.tar.xz -UserAgent "Curl"
7z x C:\ghc\ghc.tar.xz -oC:\ghc
7z x C:\ghc\ghc.tar -oC:\ghc
$env:PATH="$env:PATH;c:\ghc\ghc-8.4.3\bin;$HOME\AppData\Roaming\cabal\bin"
$env:PATH="$env:PATH;c:\ghc\ghc-8.8.2\bin;$HOME\AppData\Roaming\cabal\bin"
cabal v1-update

3
idris.cabal
View File

@ -116,6 +116,9 @@ Extra-source-files:
test/**/*.c
test/**/*.h
test/**/*.in
test/**/*.txt
test/**/*.js
test/base001/Makefile
test/ffi004/theOtherType
test/ffi004/theType
test/scripts/timeout

0
test/dsl002/test → test/dsl002/test.in
View File

2
test/dsl002/test014.idr
View File

@ -64,6 +64,6 @@ readH fn = res (do let x = open fn Reading
else rputStrLn "Error")
main : IO ()
main = run (readH "test")
main = run (readH "test.in")

2
test/effects001/test021.idr
View File

@ -31,7 +31,7 @@ readFileCount = readAcc []
testFile : TestFileIO () ()
testFile = do
Success <- open "testFile" Read
Success <- open "testFile.in" Read
| (FError err) => do
putStrLn "Error!"
pure ()

0
test/effects001/testFile → test/effects001/testFile.in
View File

0
test/ffi011/ffi011 → test/ffi011/ffi011.js
View File

2
test/ffi011/run.sh
View File

@ -1,4 +1,4 @@
#!/usr/bin/env bash
${IDRIS:-idris} $@ ffi011.idr --interface -o lib.js
node ./ffi011
node ./ffi011.js
rm -f *.ibc lib.js

0
test/ffi012/ffi012 → test/ffi012/ffi012.js
View File

46
test/pkg010/expected.out
View File

@ -4,28 +4,26 @@ Uncaught error: user error (wrongopts.ipkg:4:1:
| ^
Invalid option `-total'
Usage: ([--nobanner] | [-q|--quiet] | [--ide-mode] | [--ide-mode-socket] |
[--client ARG] | [--log LEVEL] | [--logging-categories CATS] |
[--nobasepkgs] | [--noprelude] | [--nobuiltins] | [--check] |
[-o|--output FILE] | [--interface] | [--typeintype] | [--total] |
[--partial] | [--warnpartial] | [--warnreach] | [--warnipkg] |
[--nocoverage] | [--errorcontext] | [--info] | [--listlogcats] |
[--link] | [--listlibs] | [--libdir] | [--docdir] | [--include] | [--V2]
| [--V1] | [-V|--V0|--verbose] | [--ibcsubdir FILE] |
[-i|--idrispath ARG] | [--sourcepath ARG] | [--warn] |
[-p|--package ARG] | [--port PORT] | [--build IPKG] | [--install IPKG] |
[--repl IPKG] | [--clean IPKG] | [--mkdoc IPKG] | [--installdoc IPKG] |
[--checkpkg IPKG] | [--testpkg IPKG] | [--indent-with INDENT] |
[--indent-clause INDENT] | [--bytecode ARG] | [-S|--codegenonly] |
[-c|--compileonly] | [--dumpdefuns ARG] | [--dumpcases ARG] |
[--codegen TARGET] | [--portable-codegen TARGET] | [--cg-opt ARG] |
[-e|--eval EXPR] | [--execute] | [--exec EXPR] | [-X|--extension EXT] |
[--O3] | [--O2] | [--O1] | [--O0] | [--partial-eval] |
[--no-partial-eval] |
[--optimise-nat-like-types|--optimize-nat-like-types] |
[--no-optimise-nat-like-types|--no-optimize-nat-like-types] |
[-O|--level ARG] | [--target TRIPLE] | [--cpu CPU] | [--color|--colour]
| [--nocolor|--nocolour] | [--consolewidth WIDTH] | [--highlight] |
[--no-tactic-deprecation-warnings] |
[--allow-capitalized-pattern-variables]) [FILES] [-v|--version]
Usage: [--nobanner | (-q|--quiet) | --ide-mode | --ide-mode-socket |
--client ARG | --log LEVEL | --logging-categories CATS |
--nobasepkgs | --noprelude | --nobuiltins | --check |
(-o|--output FILE) | --interface | --typeintype | --total |
--partial | --warnpartial | --warnreach | --warnipkg | --nocoverage |
--errorcontext | --info | --listlogcats | --link | --listlibs |
--libdir | --docdir | --include | --V2 | --V1 | (-V|--V0|--verbose) |
--ibcsubdir FILE | (-i|--idrispath ARG) | --sourcepath ARG | --warn |
(-p|--package ARG) | --port PORT | --build IPKG | --install IPKG |
--repl IPKG | --clean IPKG | --mkdoc IPKG | --installdoc IPKG |
--checkpkg IPKG | --testpkg IPKG | --indent-with INDENT |
--indent-clause INDENT | --bytecode ARG | (-S|--codegenonly) |
(-c|--compileonly) | --dumpdefuns ARG | --dumpcases ARG |
--codegen TARGET | --portable-codegen TARGET | --cg-opt ARG |
(-e|--eval EXPR) | --execute | --exec EXPR | (-X|--extension EXT) |
--O3 | --O2 | --O1 | --O0 | --partial-eval | --no-partial-eval |
(--optimise-nat-like-types|--optimize-nat-like-types) |
(--no-optimise-nat-like-types|--no-optimize-nat-like-types) |
(-O|--level ARG) | --target TRIPLE | --cpu CPU | (--color|--colour) |
(--nocolor|--nocolour) | --consolewidth WIDTH | --highlight |
--no-tactic-deprecation-warnings |
--allow-capitalized-pattern-variables] [FILES] [-v|--version]
)

2
test/st001/test001.idr
View File

@ -40,7 +40,7 @@ readFileCount fh cnt =
testFile : (ConsoleIO m, File m) => ST m () []
testFile = with ST do
Right fileHandle <- open "testFile" Read
Right fileHandle <- open "testFile.in" Read
| Left ferr => do putStrLn (show ferr)
pure ()
count <- new 0

0
test/st001/testFile → test/st001/testFile.in
View File

2
test/st002/test002.idr
View File

@ -40,7 +40,7 @@ readFileCount fh cnt =
testFile : (ConsoleIO m, File m) => ST m () []
testFile = with ST do
Right fileHandle <- open "testFile" Read
Right fileHandle <- open "testFile.in" Read
| Left ferr => do putStrLn (show ferr)
pure ()
count <- new 0

0
test/st002/testFile → test/st002/testFile.in
View File

2
test/st003/test003.idr
View File

@ -7,7 +7,7 @@ import Control.ST.ImplicitCall
testFile : (ConsoleIO m, File m) => ST m () []
testFile = with ST do
Right str <- readFile "testFile"
Right str <- readFile "testFile.in"
| Left ferr => do putStrLn (show ferr)
pure ()
putStrLn str

0
test/st003/testFile → test/st003/testFile.in
View File