Skip to content

Commit d8d77d9

Browse files
committed
added third test attempt
1 parent b3df29d commit d8d77d9

File tree

2 files changed

+9
-13
lines changed

2 files changed

+9
-13
lines changed

.circleci/config.yml

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,7 @@ defaults: &defaults
6969

7070
- run:
7171
name: Setup stack eval stack.html
72-
command: cp resolver.txt test/testdata/eval/stack.yaml;grep '^compiler:' stack-build.txt >> test/testdata/eval/stack.yaml
73-
74-
# - run:
75-
# name: Show resolver
76-
# command: cat resolver.txt
72+
command: grep '^resolver:' stack-build.txt > test/testdata/eval/stack.yaml;grep '^compiler:' stack-build.txt >> test/testdata/eval/stack.yaml
7773

7874
- run:
7975
name: Test haskell-language-server func-test suite
@@ -189,11 +185,11 @@ workflows:
189185
multiple-ghcs:
190186
jobs:
191187
- ghc-8.6.4
192-
# - ghc-8.6.5
193-
# - ghc-8.8.2
194-
#- ghc-8.8.3
195-
#- ghc-8.8.4
196-
# - ghc-8.10.1
197-
# - ghc-8.10.2
188+
- ghc-8.6.5
189+
- ghc-8.8.2
190+
- ghc-8.8.3
191+
- ghc-8.8.4
192+
- ghc-8.10.1
193+
- ghc-8.10.2
198194
# - ghc-nightly
199-
# - cabal
195+
- cabal

.github/workflows/test.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ jobs:
7171
# run the tests without parallelism, otherwise tasty will attempt to run
7272
# all functional test cases simultaneously which causes way too many hls
7373
# instances to be spun up for the poor github actions runner to handle
74-
run: cabal test func-test --test-options="-j1 --rerun-update" || cabal test func-test --test-options="-j1 --rerun" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test func-test --test-options="-j1 --rerun"
74+
run: cabal test func-test --test-options="-j1 --rerun-update" || cabal test func-test --test-options="-j1 --rerun --rerun-update" || cabal test func-test --test-options="-j1 --rerun" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test func-test --test-options="-j1 --rerun"
7575

7676
- name: Test wrapper-test suite
7777
shell: bash

0 commit comments

Comments
 (0)