Skip to content

Commit 528d7b6

Browse files
authored
Refactor tests to work correctly (#872)
* Rewrite tests * Remove case ignore * Set ghc version explictly * Loosen timeout for test 4 * Lossen total test time to 3 mins * Ignore case to match ghc-8.10.4 * Don't open test file twice * Trigger CI * Restore 90 secs * Don't await openTextDocument * Multi ghc * 180 sec timeout * 18 -> 180 * Log time
1 parent 92b737b commit 528d7b6

File tree

6 files changed

+177
-147
lines changed

6 files changed

+177
-147
lines changed

.eslintrc.json

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,23 @@
33
"browser": true,
44
"es2021": true
55
},
6-
"extends": ["eslint:recommended", "plugin:@typescript-eslint/recommended"],
6+
"extends": [
7+
"eslint:recommended",
8+
"plugin:@typescript-eslint/recommended"
9+
],
710
"overrides": [],
811
"parser": "@typescript-eslint/parser",
912
"parserOptions": {
1013
"ecmaVersion": "latest",
1114
"sourceType": "module"
1215
},
13-
"plugins": ["@typescript-eslint"],
14-
"rules": {}
15-
}
16+
"plugins": [
17+
"@typescript-eslint"
18+
],
19+
"rules": {
20+
"semi": [
21+
"error",
22+
"always"
23+
]
24+
}
25+
}

.github/workflows/test.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
fail-fast: false
1313
matrix:
1414
os: [macos-11, ubuntu-latest, windows-latest]
15-
ghc: [9.0.2, 8.10.4]
15+
ghc: [9.0.2, 8.10.4, 9.2.7, 9.4.5, 9.6.1]
1616
runs-on: ${{ matrix.os }}
1717
steps:
1818
- name: Checkout
@@ -31,7 +31,9 @@ jobs:
3131
- name: Install cabal
3232
run: ghcup install cabal recommended
3333
- name: Install GHC
34-
run: ghcup install ghc ${{matrix.ghc}}
34+
run: |
35+
ghcup install ghc ${{matrix.ghc}}
36+
ghcup set ghc ${{matrix.ghc}}
3537
# Pre-fetch HLS binaries before the tests because otherwise
3638
# we run into timeouts. Downloading takes longer, since we download
3739
# per HLS version one HLS binary per GHC version.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -598,4 +598,4 @@
598598
"which": "^3.0.0",
599599
"yauzl": "^2.10.0"
600600
}
601-
}
601+
}

0 commit comments

Comments
 (0)