Merge pull request #346 from 64J0/64J0-patch-1

Fix CI, comment some tests and add PR template

Author: juergenhoetzel

.github/pull_request_template.md

@@ -0,0 +1,11 @@
+## Description
+
+<!-- Add a small description of the PR that you're submitting -->
+
+## How to test
+
+<!-- Please describe how one can test/verify that the PR is working (when applicable) -->
+
+## Related issues
+
+<!-- Point to the relevant issues addressed by this PR -->

.github/workflows/test.yml

@@ -2,68 +2,75 @@ name: "CI"
 on:
   pull_request:
   push:
-    # Comment out this section to enable testing of all branches.
     branches:
       - master
 jobs:
   gnu-build:
-    runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, macos-latest]
-        dotnet: [8.0.x]
+        dotnet: [9.0.x]
         emacs_version:
-          - 27.2
           - 28.2
-          - 29.3
+          - 29.4
           - snapshot
+    runs-on: ${{ matrix.os }}
     steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: ${{ matrix.dotnet }}
       - uses: purcell/setup-emacs@master
         with:
           version: ${{ matrix.emacs_version }}
-      - uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: ${{ matrix.dotnet }}
-      - uses: actions/checkout@v2
       - name: Install Eldev
         run: curl -fsSL https://raw.github.com/doublep/eldev/master/webinstall/github-eldev | sh
       - name: Show dotnet sdks
         run: dotnet --list-sdks
       - name: Show dotnet version
         run: dotnet --info
-      - name: Test
+      - name: Eldev archives
         run: |
           echo "Archives:"
           eldev archives
+      - name: Eldev dependencies
+        run: |
           echo "Dependencies:"
           eldev -v dependencies
+      - name: Test
+        run: |
           echo "Testing:"
           eldev -dtT test
+          
   windows-build:
     runs-on: windows-latest
     strategy:
       fail-fast: false
     steps:
-      - uses: actions/setup-dotnet@v1
+      - uses: actions/checkout@v4
+      - uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 6.0.200
+          dotnet-version: 9.0.x
       - name: Show dotnet sdks
         run: dotnet --list-sdks
       - name: Show dotnet version
         run: dotnet --info
       - name: Set up Emacs on Windows
         uses: jcs090218/setup-emacs-windows@master
         with:
-          version: 28.1
-      - uses: actions/checkout@v2
+          version: 29.4
       - name: Install Eldev
         run: curl.exe -fsSL https://raw.github.com/doublep/eldev/master/webinstall/eldev.bat | cmd /Q
-      - name: Test
+      - name: Eldev archives
         run: |
           echo "Archives:"
           ~/.local/bin/eldev.bat archives
+      - name: Eldev dependencies
+        run: |
           echo "Dependencies:"
           ~/.local/bin/eldev.bat dependencies
+      - name: Test
+        run: |
           echo "Testing:"
           ~/.local/bin/eldev.bat -p -dtT test

test/Test1/Test1.fsproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

test/eglot-fsharp-integration-util.el

@@ -62,7 +62,7 @@
   (find-file-noselect file))
 
 (defun eglot-fsharp--tests-connect (&optional timeout)
-  (let* ((timeout (or timeout 30))
+  (let* ((timeout (or timeout 10))
          (eglot-sync-connect t)
          (eglot-connect-timeout timeout))
     (apply #'eglot--connect (eglot--guess-contact))))

test/integration-tests.el

@@ -34,9 +34,9 @@
 (unless (eq system-type 'windows-nt)
   (describe "F# LSP Installation"
             :before-all (setq latest-version (eglot-fsharp--latest-version))
-            (it "succeeds using version 0.52.0"
-                (eglot-fsharp--maybe-install "0.52.0")
-                (expect (eglot-fsharp--installed-version) :to-equal "0.52.0"))
+            (it "succeeds using version 0.77.2"
+                (eglot-fsharp--maybe-install "0.77.2")
+                (expect (eglot-fsharp--installed-version) :to-equal "0.77.2"))
             (it (format "succeeds using latest version: %s)" latest-version)
                 (eglot-fsharp--maybe-install)
                 (expect (eglot-fsharp--installed-version) :to-equal latest-version))))
@@ -53,7 +53,7 @@
   (it "Can be invoked"
     ;; FIXME: Should use dotnet tool run
     (expect (process-file (eglot-fsharp--path-to-server) nil nil nil "--version")
-	    :to-equal 0))
+            :to-equal 0))
   (it "is enabled on F# Files"
     (with-current-buffer (eglot-fsharp--find-file-noselect "test/Test1/FileTwo.fs")
       (expect (type-of (eglot--current-server-or-lose)) :to-be 'eglot-fsautocomplete)))