Disable travis for GHC 8.8 (libffi still broken)

Update changelog Use GHC 8.8 in Appveyor Run legacy test commands
idris-lang · Jan 25, 2020 · 8375107 · 8375107
1 parent b4dc55e
commit 8375107
Show file tree

Hide file tree

Showing 9 changed files with 43 additions and 41 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -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:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -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
 

diff --git a/Makefile b/Makefile
@@ -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:

diff --git a/appveyor.yml b/appveyor.yml
@@ -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
 

diff --git a/idris.cabal b/idris.cabal
@@ -116,6 +116,8 @@ Extra-source-files:
                       test/**/*.c
                       test/**/*.h
                       test/**/*.in
+                      test/**/*.txt
+                      test/**/*.js
                       test/ffi004/theOtherType
                       test/ffi004/theType
                       test/scripts/timeout

diff --git a/test/ffi011/ffi011 → test/ffi011/ffi011.js b/test/ffi011/ffi011 → test/ffi011/ffi011.js
diff --git a/test/ffi011/run.sh b/test/ffi011/run.sh
@@ -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
diff --git a/test/ffi012/ffi012 → test/ffi012/ffi012.js b/test/ffi012/ffi012 → test/ffi012/ffi012.js
diff --git a/test/pkg010/expected.out b/test/pkg010/expected.out
@@ -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]
 )