Merge pull request #225 from juergenhoetzel/fix-travis

Travis: Fix CI

Author: juergenhoetzel

.travis.yml

@@ -3,7 +3,7 @@ language: emacs-lisp
 # See https://github.com/travis-ci/travis-ci/issues/9061
 # and https://github.com/moby/moby/issues/22801
 sudo: required
-dist: trusty
+dist: bionic
 cache:
   - directories:
       # Cache stable Emacs binaries (saves 1min per job)
@@ -13,26 +13,27 @@ cache:
 matrix:
   fast_finish: true
   allow_failures:
-    - env: EMACS_VERSION=snapshot
+    - env: EMACS_VERSION=emacs-snapshot
 env:
-  - EMACS_VERSION=25.1
-  - EMACS_VERSION=25.2
-  - EMACS_VERSION=25.3
-  - EMACS_VERSION=26.1
-  - EMACS_VERSION=snapshot
+  - EMACS_VERSION=emacs26
+  - EMACS_VERSION=emacs-snapshot
 
 before_install:
+    # Emacs kelleyk PPA
+  - sudo add-apt-repository -y ppa:kelleyk/emacs
+  - sudo apt-get update
+  - sudo apt install $EMACS_VERSION-nox
   - sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 3FA7E0328081BFF6A14DA29AA6A19B38D3D831EF
-  - wget -q https://packages.microsoft.com/config/ubuntu/14.04/packages-microsoft-prod.deb -O packages-microsoft-prod.deb
+  - wget -q https://packages.microsoft.com/config/ubuntu/18.04/packages-microsoft-prod.deb -O packages-microsoft-prod.deb
+  - sudo dpkg -i packages-microsoft-prod.deb
   - sudo apt-get update
   - sudo apt-get install apt-transport-https
-  - sudo apt-get update
-  - sudo apt-get install dotnet-sdk-2.2
+  - sudo apt-get install dotnet-sdk-2.1
   - export PATH="$HOME/bin:$PATH"
+  - export EMACS=$EMACS_VERSION
   # Download the makefile to emacs-travis.mk
   - wget 'https://raw.githubusercontent.com/flycheck/emacs-travis/master/emacs-travis.mk'
   # Install Emacs (according to $EMACS_VERSION) and Cask
-  - make -f emacs-travis.mk install_emacs
   - make -f emacs-travis.mk install_cask
   - travis_retry sudo apt-get install -y fsharp
 

Makefile

@@ -21,7 +21,10 @@ build: elpa version
 version:
 	$(EMACS) --version
 
-test: version build test/eglot-tests.el
+test/Test1/project.assets.json:
+	dotnet restore test/Test1
+
+test: version build test/eglot-tests.el test/Test1/project.assets.json
 	$(CASK) exec buttercup -L . -L ./test
 
 clean:

test/Test1/Test1.fsproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>netcoreapp2.2</TargetFramework>
+    <TargetFramework>netcoreapp2.1</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

test/integration-tests.el

@@ -34,7 +34,7 @@
     (expect (file-exists-p  (eglot-fsharp--path-to-server)) :to-be t))
   (it "is enabled on F# Files"
     (with-current-buffer (eglot--find-file-noselect "test/Test1/FileTwo.fs")
-      (eglot--tests-connect 10)
+      (eglot--tests-connect 30)
       (expect (type-of (eglot--current-server-or-lose)) :to-be 'eglot-fsautocomplete)))
   (it "provides completion"
     (with-current-buffer (eglot--find-file-noselect "test/Test1/FileTwo.fs")
@@ -45,7 +45,7 @@
       (delete-char -3)
       ;; ERROR in fsautocomplet.exe?  Should block instead of "no type check results"
       (eglot--sniffing (:server-notifications s-notifs)
-        (eglot--wait-for (s-notifs 10)
+        (eglot--wait-for (s-notifs 90)
             (&key _id method &allow-other-keys)
           (string= method "textDocument/publishDiagnostics")))
       (completion-at-point)