From 8ff9c673d426c898123cbd63ce50952aea4a313a Mon Sep 17 00:00:00 2001 From: jneira Date: Thu, 27 Feb 2020 09:12:53 +0100 Subject: [PATCH 01/21] Add cabal.project for ghc-8.8.3 --- cabal.project-8.8.3 | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 cabal.project-8.8.3 diff --git a/cabal.project-8.8.3 b/cabal.project-8.8.3 new file mode 100644 index 000000000..fee4bce9b --- /dev/null +++ b/cabal.project-8.8.3 @@ -0,0 +1,32 @@ +packages: + ./ + ./hie-plugin-api/ + + -- ./submodules/HaRe + +-- To avoid build error with ghc-8.8.2 +-- See https://github.com/haskell/haddock/issues/1123 +source-repository-package + type: git + location: https://github.com/haskell/haddock.git + subdir: haddock-api + tag: be8b02c4e3cffe7d45b3dad0a0f071d35a274d65 + +source-repository-package + type: git + location: https://github.com/jneira/cabal-helper.git + tag: ffb1f57a5ffc6b7ac3c46a9974c4420a6d2bb9b2 + +tests: true + +package haskell-ide-engine + test-show-details: direct + +-- Match the flag settings we use in stac builds +constraints: + haskell-ide-engine +pedantic + hie-plugin-api +pedantic + +write-ghc-environment-files: never + +index-state: 2020-02-24T08:44:25Z From 73f20027539334f605c3c823fa178ee5fefca8ae Mon Sep 17 00:00:00 2001 From: jneira Date: Thu, 27 Feb 2020 09:13:27 +0100 Subject: [PATCH 02/21] Add ghc-8.8.3 to the matrix of cabal jobs --- .azure/linux-cabal.yml | 2 ++ .azure/windows-cabal.yml | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.azure/linux-cabal.yml b/.azure/linux-cabal.yml index 362c8585f..5d7dc0524 100644 --- a/.azure/linux-cabal.yml +++ b/.azure/linux-cabal.yml @@ -5,6 +5,8 @@ jobs: vmImage: ubuntu-16.04 strategy: matrix: + ghc-8.8.3: + GHC_VERSION: "8.8.3" ghc-8.8.2: GHC_VERSION: "8.8.2" ghc-8.6.5: diff --git a/.azure/windows-cabal.yml b/.azure/windows-cabal.yml index bf4e9b9ab..42ddd038f 100644 --- a/.azure/windows-cabal.yml +++ b/.azure/windows-cabal.yml @@ -7,8 +7,8 @@ jobs: matrix: # ghc versions 8.8.1 and 8.8.2 are not usable in windows # due to https://gitlab.haskell.org/ghc/ghc/issues/17575 - # ghc-8.8.2: - # GHC_VERSION: "8.8.2" + ghc-8.8.3: + GHC_VERSION: "8.8.3" ghc-8.6.5: GHC_VERSION: "8.6.5" ghc-8.4.4: From 5fd1ed5040e1e0367ec881a2a3470b451eb44ce5 Mon Sep 17 00:00:00 2001 From: jneira Date: Thu, 12 Mar 2020 10:28:10 +0100 Subject: [PATCH 03/21] Add stack-8.8.3.yaml --- stack-8.8.3.yaml | 42 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 stack-8.8.3.yaml diff --git a/stack-8.8.3.yaml b/stack-8.8.3.yaml new file mode 100644 index 000000000..0fa785af6 --- /dev/null +++ b/stack-8.8.3.yaml @@ -0,0 +1,42 @@ +resolver: nightly-2020-03-12 +packages: +- . +- hie-plugin-api + +extra-deps: +# - ./submodules/HaRe + +- apply-refact-0.7.0.0 +- bytestring-trie-0.2.5.0 +# - cabal-helper-1.0.0.0 +- github: jneira/cabal-helper + commit: ffb1f57a5ffc6b7ac3c46a9974c4420a6d2bb9b2 +- clock-0.7.2 +- constrained-dynamic-0.1.0.0 +- floskell-0.10.2 +# To avoid build error with ghc-8.8.2 +# See https://github.com/haskell/haddock/issues/1123 +- git: https://github.com/haskell/haddock.git + commit: be8b02c4e3cffe7d45b3dad0a0f071d35a274d65 + subdirs: + - haddock-api +# - haddock-api-2.23.0 +- hoogle-5.0.17.15 +- hsimport-0.11.0@sha256:e8f1774aff97215d7cc3a6c81635fae75b80af182f732f8fe28d1ed6eb9c7401,3170 +- ilist-0.3.1.0 +- monad-dijkstra-0.1.1.2 +- semigroups-0.18.5 +- temporary-1.2.1.1 + +flags: + haskell-ide-engine: + pedantic: true + hie-plugin-api: + pedantic: true + +# allow-newer: true + +nix: + packages: [ icu libcxx zlib ] + +concurrent-tests: false From 7d71a48c4527bf8d9503d7435f8c501c4d5c362c Mon Sep 17 00:00:00 2001 From: jneira Date: Thu, 12 Mar 2020 10:33:55 +0100 Subject: [PATCH 04/21] Add ghc-8.8.3 to ci --- .azure/linux-stack.yml | 2 ++ .azure/macos-stack.yml | 2 ++ .azure/windows-stack.yml | 2 ++ .circleci/config.yml | 5 +++++ 4 files changed, 11 insertions(+) diff --git a/.azure/linux-stack.yml b/.azure/linux-stack.yml index d437dfe82..67a4c0b4a 100644 --- a/.azure/linux-stack.yml +++ b/.azure/linux-stack.yml @@ -7,6 +7,8 @@ jobs: matrix: stack-def: YAML_FILE: stack.yaml + stack-8.8.3: + YAML_FILE: stack-8.8.3.yaml stack-8.8.2: YAML_FILE: stack-8.8.2.yaml stack-8.8.1: diff --git a/.azure/macos-stack.yml b/.azure/macos-stack.yml index fad15c141..f5a82d1a9 100644 --- a/.azure/macos-stack.yml +++ b/.azure/macos-stack.yml @@ -7,6 +7,8 @@ jobs: matrix: stack-def: YAML_FILE: stack.yaml + stack-8.8.3: + YAML_FILE: stack-8.8.3.yaml stack-8.8.2: YAML_FILE: stack-8.8.2.yaml stack-8.8.1: diff --git a/.azure/windows-stack.yml b/.azure/windows-stack.yml index e3ed26766..e6d350a91 100644 --- a/.azure/windows-stack.yml +++ b/.azure/windows-stack.yml @@ -9,6 +9,8 @@ jobs: # TODO: Enable it when it uses ghc-8.8.3 # stack-def: # YAML_FILE: stack.yaml + stack-8.8.3: + YAML_FILE: stack-8.8.3.yaml # ghc versions 8.8.1 and 8.8.2 are not usable in windows # due to https://gitlab.haskell.org/ghc/ghc/issues/17575 stack-8.6.5: diff --git a/.circleci/config.yml b/.circleci/config.yml index 6570a80e9..275fc2c9d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -136,6 +136,11 @@ jobs: - STACK_FILE: "stack-8.8.2.yaml" <<: *defaults + ghc-8.8.3: + environment: + - STACK_FILE: "stack-8.8.3.yaml" + <<: *defaults + ghc-nightly: environment: - STACK_FILE: "stack.yaml" From 41deffa992977a33ee8332aa7288d4c04b906702 Mon Sep 17 00:00:00 2001 From: jneira Date: Thu, 12 Mar 2020 10:36:34 +0100 Subject: [PATCH 05/21] Update index state to use hsimport rev --- cabal.project-8.8.3 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cabal.project-8.8.3 b/cabal.project-8.8.3 index fee4bce9b..cffb5319f 100644 --- a/cabal.project-8.8.3 +++ b/cabal.project-8.8.3 @@ -29,4 +29,4 @@ constraints: write-ghc-environment-files: never -index-state: 2020-02-24T08:44:25Z +index-state: 2020-03-03T21:13:56Z From 07d603368b8cac558dcc6ff8a1f04d5ad363c11e Mon Sep 17 00:00:00 2001 From: jneira Date: Thu, 12 Mar 2020 10:39:31 +0100 Subject: [PATCH 06/21] Remove ghc-8.8.1 (version without lts) --- .azure/linux-stack.yml | 2 -- .azure/macos-stack.yml | 2 -- .circleci/config.yml | 5 ----- stack-8.8.1.yaml | 50 ------------------------------------------ 4 files changed, 59 deletions(-) delete mode 100644 stack-8.8.1.yaml diff --git a/.azure/linux-stack.yml b/.azure/linux-stack.yml index 67a4c0b4a..f69f85d95 100644 --- a/.azure/linux-stack.yml +++ b/.azure/linux-stack.yml @@ -11,8 +11,6 @@ jobs: YAML_FILE: stack-8.8.3.yaml stack-8.8.2: YAML_FILE: stack-8.8.2.yaml - stack-8.8.1: - YAML_FILE: stack-8.8.1.yaml stack-8.6.5: YAML_FILE: stack-8.6.5.yaml stack-8.6.4: diff --git a/.azure/macos-stack.yml b/.azure/macos-stack.yml index f5a82d1a9..68729b44b 100644 --- a/.azure/macos-stack.yml +++ b/.azure/macos-stack.yml @@ -11,8 +11,6 @@ jobs: YAML_FILE: stack-8.8.3.yaml stack-8.8.2: YAML_FILE: stack-8.8.2.yaml - stack-8.8.1: - YAML_FILE: stack-8.8.1.yaml stack-8.6.5: YAML_FILE: stack-8.6.5.yaml stack-8.6.4: diff --git a/.circleci/config.yml b/.circleci/config.yml index 275fc2c9d..a07341824 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -126,11 +126,6 @@ jobs: - STACK_FILE: "stack-8.6.5.yaml" <<: *defaults - ghc-8.8.1: - environment: - - STACK_FILE: "stack-8.8.1.yaml" - <<: *defaults - ghc-8.8.2: environment: - STACK_FILE: "stack-8.8.2.yaml" diff --git a/stack-8.8.1.yaml b/stack-8.8.1.yaml deleted file mode 100644 index 63215b320..000000000 --- a/stack-8.8.1.yaml +++ /dev/null @@ -1,50 +0,0 @@ -resolver: nightly-2020-01-21 # last GHC 8.8.1 -packages: -- . -- hie-plugin-api - -extra-deps: -# - ./submodules/HaRe - -- aeson-1.4.6.0 -- apply-refact-0.7.0.0 -- brittany-0.12.1.1 -- bytestring-trie-0.2.5.0 -# - cabal-helper-1.0.0.0 -- github: DanielG/cabal-helper - commit: a18bbb2af92e9b4337e7f930cb80754f2408bcfd -- clock-0.7.2 -- constrained-dynamic-0.1.0.0 -- extra-1.6.21 -- floskell-0.10.2 -- ghc-lib-parser-ex-8.8.5.3 -- haddock-api-2.23.0 -- haddock-library-1.8.0 -- haskell-lsp-0.20.0.0 -- haskell-lsp-types-0.20.0.0 -- lsp-test-0.10.1.0 -- hie-bios-0.4.0 -- hlint-2.2.11 -- hoogle-5.0.17.15 -- hsimport-0.11.0@sha256:e8f1774aff97215d7cc3a6c81635fae75b80af182f732f8fe28d1ed6eb9c7401,3170 -- ilist-0.3.1.0 -- monad-dijkstra-0.1.1.2 -- ormolu-0.0.3.1 -- resourcet-1.2.3 # forced by unliftio-core >= 0.2 -- semigroups-0.18.5 -- temporary-1.2.1.1 -- unliftio-0.2.12.1 -- unliftio-core-0.2.0.1 - -flags: - haskell-ide-engine: - pedantic: true - hie-plugin-api: - pedantic: true - -# allow-newer: true - -nix: - packages: [ icu libcxx zlib ] - -concurrent-tests: false From 68a57bb61c25c3fcbbc6b4e52b4a2fc9edc64ef1 Mon Sep 17 00:00:00 2001 From: jneira Date: Thu, 12 Mar 2020 11:12:34 +0100 Subject: [PATCH 07/21] Avoid unlift-core-0.2.0.0 --- cabal.project-8.8.3 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cabal.project-8.8.3 b/cabal.project-8.8.3 index cffb5319f..4b061f363 100644 --- a/cabal.project-8.8.3 +++ b/cabal.project-8.8.3 @@ -24,7 +24,9 @@ package haskell-ide-engine -- Match the flag settings we use in stac builds constraints: - haskell-ide-engine +pedantic + -- to avoid temporary a breaking change: https://github.com/haskell/haskell-ide-engine/issues/1680 + unliftio-core < 0.2.0.0, + haskell-ide-engine +pedantic, hie-plugin-api +pedantic write-ghc-environment-files: never From 9ec87df18e3d07ceee61905461db4aa0d8679a17 Mon Sep 17 00:00:00 2001 From: jneira Date: Thu, 12 Mar 2020 11:39:55 +0100 Subject: [PATCH 08/21] Use ghc-8.8.3 for macos-installhs-cabal --- .azure/macos-installhs-cabal.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.azure/macos-installhs-cabal.yml b/.azure/macos-installhs-cabal.yml index b73b0dbdd..735d7fdc0 100644 --- a/.azure/macos-installhs-cabal.yml +++ b/.azure/macos-installhs-cabal.yml @@ -21,8 +21,7 @@ jobs: displayName: "Unpack cache" condition: eq(variables.CACHE_RESTORED, 'true') - bash: | - # TODO Install ghc-8.8.3 when adding stack-8.8.3.yaml - brew install ghc@8.6 + brew install ghc@8.8 brew install cabal-install --ignore-dependencies ghc which cabal which ghc From 8e7739498eed12174a9acb2334ebac9e47f52121 Mon Sep 17 00:00:00 2001 From: jneira Date: Thu, 12 Mar 2020 13:48:52 +0100 Subject: [PATCH 09/21] Change ghc-8.8.1 -> ghc-8.8.3 in circle ci config --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a07341824..d468859ea 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -181,7 +181,7 @@ workflows: - ghc-8.4.4 - ghc-8.6.4 - ghc-8.6.5 - - ghc-8.8.1 - ghc-8.8.2 + - ghc-8.8.3 - ghc-nightly - cabal From 0bdf8ccd9cfffff74bb2d3eb1950856ee1abed02 Mon Sep 17 00:00:00 2001 From: jneira Date: Sun, 22 Mar 2020 22:55:32 +0100 Subject: [PATCH 10/21] Update ghc-8.8.3 stackage resolvers --- stack-8.8.3.yaml | 7 +++---- stack.yaml | 21 +++++++++++++-------- 2 files changed, 16 insertions(+), 12 deletions(-) diff --git a/stack-8.8.3.yaml b/stack-8.8.3.yaml index 0fa785af6..66afc0091 100644 --- a/stack-8.8.3.yaml +++ b/stack-8.8.3.yaml @@ -1,4 +1,4 @@ -resolver: nightly-2020-03-12 +resolver: lts-15.4 packages: - . - hie-plugin-api @@ -7,7 +7,7 @@ extra-deps: # - ./submodules/HaRe - apply-refact-0.7.0.0 -- bytestring-trie-0.2.5.0 +- bytestring-trie-0.2.5.0@rev1 # - cabal-helper-1.0.0.0 - github: jneira/cabal-helper commit: ffb1f57a5ffc6b7ac3c46a9974c4420a6d2bb9b2 @@ -27,6 +27,7 @@ extra-deps: - monad-dijkstra-0.1.1.2 - semigroups-0.18.5 - temporary-1.2.1.1 +- unliftio-core-0.2.0.1 flags: haskell-ide-engine: @@ -34,8 +35,6 @@ flags: hie-plugin-api: pedantic: true -# allow-newer: true - nix: packages: [ icu libcxx zlib ] diff --git a/stack.yaml b/stack.yaml index dc95ce7a0..d4062253c 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,4 +1,5 @@ -resolver: nightly-2020-03-09 # Last GHC 8.8.2 +resolver: nightly-2020-03-18 + packages: - . - hie-plugin-api @@ -7,14 +8,14 @@ extra-deps: # - ./submodules/HaRe - apply-refact-0.7.0.0 -- brittany-0.12.1.1 -- bytestring-trie-0.2.5.0 +- bytestring-trie-0.2.5.0@sha256:9efa9c6f556314d28486be2470ff789419c5238ed2e354870623a3cbbd28fbe2,3349 # - cabal-helper-1.0.0.0 - github: DanielG/cabal-helper commit: a18bbb2af92e9b4337e7f930cb80754f2408bcfd - clock-0.7.2 - constrained-dynamic-0.1.0.0 - floskell-0.10.2 +<<<<<<< HEAD - ghc-lib-parser-8.8.2.20200205 - ghc-lib-parser-ex-8.8.5.3 - haddock-api-2.23.1 @@ -24,15 +25,21 @@ extra-deps: - lsp-test-0.10.1.0 - hie-bios-0.4.0 - hlint-2.2.11 +======= +# To avoid build error with ghc-8.8.2 +# See https://github.com/haskell/haddock/issues/1123 +- git: https://github.com/haskell/haddock.git + commit: be8b02c4e3cffe7d45b3dad0a0f071d35a274d65 + subdirs: + - haddock-api +# - haddock-api-2.23.0 +>>>>>>> a8e55590... Update ghc-8.8.3 stackage resolvers - hoogle-5.0.17.15 - hsimport-0.11.0@sha256:e8f1774aff97215d7cc3a6c81635fae75b80af182f732f8fe28d1ed6eb9c7401,3170 - ilist-0.3.1.0 - monad-dijkstra-0.1.1.2 -- ormolu-0.0.3.1 -- resourcet-1.2.3 # forced by unliftio-core >= 0.2 - semigroups-0.18.5 - temporary-1.2.1.1 -- unliftio-0.2.12.1 - unliftio-core-0.2.0.1 flags: @@ -41,8 +48,6 @@ flags: hie-plugin-api: pedantic: true -# allow-newer: true - nix: packages: [ icu libcxx zlib ] From 5465d913caa8a367afe334de890e5c48a03a2664 Mon Sep 17 00:00:00 2001 From: jneira Date: Sun, 5 Apr 2020 22:40:28 +0200 Subject: [PATCH 11/21] Use last versions of haddock and unlift-io-core --- cabal.project-8.8.3 | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/cabal.project-8.8.3 b/cabal.project-8.8.3 index 4b061f363..f10624e9f 100644 --- a/cabal.project-8.8.3 +++ b/cabal.project-8.8.3 @@ -4,14 +4,6 @@ packages: -- ./submodules/HaRe --- To avoid build error with ghc-8.8.2 --- See https://github.com/haskell/haddock/issues/1123 -source-repository-package - type: git - location: https://github.com/haskell/haddock.git - subdir: haddock-api - tag: be8b02c4e3cffe7d45b3dad0a0f071d35a274d65 - source-repository-package type: git location: https://github.com/jneira/cabal-helper.git @@ -24,8 +16,6 @@ package haskell-ide-engine -- Match the flag settings we use in stac builds constraints: - -- to avoid temporary a breaking change: https://github.com/haskell/haskell-ide-engine/issues/1680 - unliftio-core < 0.2.0.0, haskell-ide-engine +pedantic, hie-plugin-api +pedantic From 385ee03b3a9fa3c73388bcf6ef39eee0d81031a9 Mon Sep 17 00:00:00 2001 From: jneira Date: Mon, 6 Apr 2020 00:08:08 +0200 Subject: [PATCH 12/21] Update index-state to latest --- cabal.project-8.8.3 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cabal.project-8.8.3 b/cabal.project-8.8.3 index f10624e9f..a0eb21d08 100644 --- a/cabal.project-8.8.3 +++ b/cabal.project-8.8.3 @@ -4,6 +4,8 @@ packages: -- ./submodules/HaRe +with-compiler: ghc-8.8.3 + source-repository-package type: git location: https://github.com/jneira/cabal-helper.git @@ -21,4 +23,4 @@ constraints: write-ghc-environment-files: never -index-state: 2020-03-03T21:13:56Z +index-state: 2020-04-05T19:55:18Z From e8e801fbecb2f76a4f81e934d26c8fe1dd2ac0b5 Mon Sep 17 00:00:00 2001 From: jneira Date: Mon, 6 Apr 2020 09:58:33 +0200 Subject: [PATCH 13/21] Remove not needed project files --- cabal.project-8.8.3 | 26 -------------------------- 1 file changed, 26 deletions(-) delete mode 100644 cabal.project-8.8.3 diff --git a/cabal.project-8.8.3 b/cabal.project-8.8.3 deleted file mode 100644 index a0eb21d08..000000000 --- a/cabal.project-8.8.3 +++ /dev/null @@ -1,26 +0,0 @@ -packages: - ./ - ./hie-plugin-api/ - - -- ./submodules/HaRe - -with-compiler: ghc-8.8.3 - -source-repository-package - type: git - location: https://github.com/jneira/cabal-helper.git - tag: ffb1f57a5ffc6b7ac3c46a9974c4420a6d2bb9b2 - -tests: true - -package haskell-ide-engine - test-show-details: direct - --- Match the flag settings we use in stac builds -constraints: - haskell-ide-engine +pedantic, - hie-plugin-api +pedantic - -write-ghc-environment-files: never - -index-state: 2020-04-05T19:55:18Z From 9073c3997bf901b9e85885e67066b9e8493ca925 Mon Sep 17 00:00:00 2001 From: fendor Date: Tue, 7 Apr 2020 19:34:00 +0200 Subject: [PATCH 14/21] Update Testutils to use the correct stack.yaml --- test/utils/TestUtils.hs | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/test/utils/TestUtils.hs b/test/utils/TestUtils.hs index b703f35c6..9214f5eff 100644 --- a/test/utils/TestUtils.hs +++ b/test/utils/TestUtils.hs @@ -172,7 +172,9 @@ ghcVersion = GHC84 stackYaml :: FilePath stackYaml = -#if (defined(MIN_VERSION_GLASGOW_HASKELL) && (MIN_VERSION_GLASGOW_HASKELL(8,8,2,0))) +#if (defined(MIN_VERSION_GLASGOW_HASKELL) && (MIN_VERSION_GLASGOW_HASKELL(8,8,3,0))) + "stack-8.8.3.yaml" +#elif (defined(MIN_VERSION_GLASGOW_HASKELL) && (MIN_VERSION_GLASGOW_HASKELL(8,8,2,0))) "stack-8.8.2.yaml" #elif (defined(MIN_VERSION_GLASGOW_HASKELL) && (MIN_VERSION_GLASGOW_HASKELL(8,8,1,0))) "stack-8.8.1.yaml" From 3fb74dc88011f20b272179a9007ea47bf8d893e4 Mon Sep 17 00:00:00 2001 From: jneira Date: Wed, 8 Apr 2020 23:58:37 +0200 Subject: [PATCH 15/21] Use resolver instead yaml files to download ghc --- .azure/windows-cabal.yml | 4 ++-- .azure/windows-stack.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.azure/windows-cabal.yml b/.azure/windows-cabal.yml index 42ddd038f..4dee160e1 100644 --- a/.azure/windows-cabal.yml +++ b/.azure/windows-cabal.yml @@ -106,8 +106,8 @@ jobs: - bash: | source .azure/windows-cabal.bashrc # Needed for wrapper-test - stack setup --stack-yaml stack-8.8.1.yaml - stack setup --stack-yaml stack-8.6.5.yaml + stack setup --resolver ghc-8.8.1 + stack setup --resolver ghc-8.6.5 # TODO Enable :dispatcher-test suite cabal v2-test :plugin-dispatcher-test :wrapper-test # :dispatcher-test --project-file $PROJECT_FILE displayName: "Run Test: dispatcher-test, plugin-dispatcher-test and wrapper-test" diff --git a/.azure/windows-stack.yml b/.azure/windows-stack.yml index e6d350a91..f0b94f6b8 100644 --- a/.azure/windows-stack.yml +++ b/.azure/windows-stack.yml @@ -119,8 +119,8 @@ jobs: - bash: | source .azure/windows-stack.bashrc # Needed for wrapper-test - stack setup --stack-yaml stack-8.8.1.yaml - stack setup --stack-yaml stack-8.6.5.yaml + stack setup --resolver ghc-8.8.1 + stack setup --resolver ghc-8.6.5 # TODO: Enable :dispatcher-test suite stack test :plugin-dispatcher-test :wrapper-test --stack-yaml $(YAML_FILE) displayName: "Run Test: dispatcher-test, plugin-dispatcher-test and wrapper-test" From b580f7bd4be8cfaafd20909370f68e00c48c6645 Mon Sep 17 00:00:00 2001 From: jneira Date: Thu, 9 Apr 2020 14:34:14 +0200 Subject: [PATCH 16/21] Dont build windows with stack-8.8.3.yaml --- .azure/windows-stack.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.azure/windows-stack.yml b/.azure/windows-stack.yml index f0b94f6b8..b13a39d6a 100644 --- a/.azure/windows-stack.yml +++ b/.azure/windows-stack.yml @@ -5,14 +5,16 @@ jobs: vmImage: windows-2019 strategy: matrix: - # default stack.yaml uses ghc-8.8.2 so we can't use it for windows - # TODO: Enable it when it uses ghc-8.8.3 + # default stack.yaml uses ghc-8.8.3 so we can't use it for windows + # TODO: Enable it when it uses a version without bugs for windows # stack-def: # YAML_FILE: stack.yaml - stack-8.8.3: - YAML_FILE: stack-8.8.3.yaml # ghc versions 8.8.1 and 8.8.2 are not usable in windows # due to https://gitlab.haskell.org/ghc/ghc/issues/17575 + # ghc-8.8.3 throws segfaults in ci envs so we can't use it neither + # due to https://gitlab.haskell.org/ghc/ghc/issues/17926 + stack-8.8.3: + YAML_FILE: stack-8.8.3.yaml stack-8.6.5: YAML_FILE: stack-8.6.5.yaml stack-8.6.4: From 49c76b919ed4547ca8eed1ea9377f831a15ac1fb Mon Sep 17 00:00:00 2001 From: jneira Date: Thu, 9 Apr 2020 15:57:38 +0200 Subject: [PATCH 17/21] Don't use ghc-8.8.3 for windows cabal --- .azure/windows-cabal.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.azure/windows-cabal.yml b/.azure/windows-cabal.yml index 4dee160e1..150b728eb 100644 --- a/.azure/windows-cabal.yml +++ b/.azure/windows-cabal.yml @@ -7,8 +7,8 @@ jobs: matrix: # ghc versions 8.8.1 and 8.8.2 are not usable in windows # due to https://gitlab.haskell.org/ghc/ghc/issues/17575 - ghc-8.8.3: - GHC_VERSION: "8.8.3" + # ghc-8.8.3 throws segfaults in ci envs so we can't use it neither + # due to https://gitlab.haskell.org/ghc/ghc/issues/17926 ghc-8.6.5: GHC_VERSION: "8.6.5" ghc-8.4.4: From d4a6a17a0290134850db1784742adbdfcbdff771 Mon Sep 17 00:00:00 2001 From: jneira Date: Thu, 9 Apr 2020 16:17:51 +0200 Subject: [PATCH 18/21] Update resolvers of install/shake.yaml --- install/shake.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/install/shake.yaml b/install/shake.yaml index 629cd0d81..65a438409 100644 --- a/install/shake.yaml +++ b/install/shake.yaml @@ -1,7 +1,7 @@ # Used to provide a different environment for the shake build script -resolver: lts-13.19 # last lts with GHC 8.6.5 -# resolver: nightly-2020-01-31 # GHC 8.8.2 -# resolver: nightly-2020-01-21 # last nightly GHC 8.8.1 +resolver: lts-14.27 # last lts GHC 8.6.5 +# resolver: lts-15.7 # lts GHC 8.8.3 +# resolver: lts-15.3 # last lts GHC 8.8.2 # resolver: lts-13.19 # last lts GHC 8.6.4 # resolver: lts-12.26 # last lts GHC 8.4.4 # resolver: lts-12.14 # last lts GHC 8.4.3 From 6765fa6f6c58d32004dc1130a8996b2133be8f70 Mon Sep 17 00:00:00 2001 From: jneira Date: Thu, 9 Apr 2020 21:30:02 +0200 Subject: [PATCH 19/21] Install hie-8.6.5 to avoid segfaults with ghc-8.8.3 --- .azure/windows-installhs-stack.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.azure/windows-installhs-stack.yml b/.azure/windows-installhs-stack.yml index 21ed96e88..622e03298 100644 --- a/.azure/windows-installhs-stack.yml +++ b/.azure/windows-installhs-stack.yml @@ -6,6 +6,7 @@ jobs: variables: YAML_FILE: install/shake.yaml STACK_ROOT: "C:\\sr" + GHC_VERSION: "8.6.5" steps: - task: Cache@2 inputs: @@ -46,7 +47,8 @@ jobs: - bash: | source .azure/windows-stack.bashrc # Some executions fails with spurious errors installing executables - stack install.hs latest || stack install.hs latest + # We can't install the latest target cause it is ghc-8.8.3 and throws segfaults + stack install.hs hie-${GHC_VERSION} || stack install.hs hie-${GHC_VERSION} displayName: Run latest target of `install.hs` - bash: | mkdir -p .azure-cache From 9327f6389eb81d8ea74362fbf908b42995d416c7 Mon Sep 17 00:00:00 2001 From: jneira Date: Thu, 9 Apr 2020 22:14:32 +0200 Subject: [PATCH 20/21] Correct ghc-8.8.3 stack.yaml's --- stack-8.8.3.yaml | 14 +++++--------- stack.yaml | 15 ++------------- 2 files changed, 7 insertions(+), 22 deletions(-) diff --git a/stack-8.8.3.yaml b/stack-8.8.3.yaml index 66afc0091..2f11c3834 100644 --- a/stack-8.8.3.yaml +++ b/stack-8.8.3.yaml @@ -9,20 +9,16 @@ extra-deps: - apply-refact-0.7.0.0 - bytestring-trie-0.2.5.0@rev1 # - cabal-helper-1.0.0.0 -- github: jneira/cabal-helper - commit: ffb1f57a5ffc6b7ac3c46a9974c4420a6d2bb9b2 +- github: DanielG/cabal-helper + commit: a18bbb2af92e9b4337e7f930cb80754f2408bcfd - clock-0.7.2 - constrained-dynamic-0.1.0.0 - floskell-0.10.2 -# To avoid build error with ghc-8.8.2 -# See https://github.com/haskell/haddock/issues/1123 -- git: https://github.com/haskell/haddock.git - commit: be8b02c4e3cffe7d45b3dad0a0f071d35a274d65 - subdirs: - - haddock-api -# - haddock-api-2.23.0 +- haddock-api-2.23.1 - hoogle-5.0.17.15 - hsimport-0.11.0@sha256:e8f1774aff97215d7cc3a6c81635fae75b80af182f732f8fe28d1ed6eb9c7401,3170 +- ghc-lib-parser-8.8.2.20200205 +- ghc-lib-parser-ex-8.8.5.3 - ilist-0.3.1.0 - monad-dijkstra-0.1.1.2 - semigroups-0.18.5 diff --git a/stack.yaml b/stack.yaml index d4062253c..13b12fec9 100644 --- a/stack.yaml +++ b/stack.yaml @@ -1,4 +1,4 @@ -resolver: nightly-2020-03-18 +resolver: nightly-2020-04-09 packages: - . @@ -15,25 +15,14 @@ extra-deps: - clock-0.7.2 - constrained-dynamic-0.1.0.0 - floskell-0.10.2 -<<<<<<< HEAD - ghc-lib-parser-8.8.2.20200205 - ghc-lib-parser-ex-8.8.5.3 - haddock-api-2.23.1 - haddock-library-1.8.0 - haskell-lsp-0.20.0.0 - haskell-lsp-types-0.20.0.0 +- haskell-src-exts-1.22.0 - lsp-test-0.10.1.0 -- hie-bios-0.4.0 -- hlint-2.2.11 -======= -# To avoid build error with ghc-8.8.2 -# See https://github.com/haskell/haddock/issues/1123 -- git: https://github.com/haskell/haddock.git - commit: be8b02c4e3cffe7d45b3dad0a0f071d35a274d65 - subdirs: - - haddock-api -# - haddock-api-2.23.0 ->>>>>>> a8e55590... Update ghc-8.8.3 stackage resolvers - hoogle-5.0.17.15 - hsimport-0.11.0@sha256:e8f1774aff97215d7cc3a6c81635fae75b80af182f732f8fe28d1ed6eb9c7401,3170 - ilist-0.3.1.0 From 6aa0e39be55463de101168368fef4366989687b0 Mon Sep 17 00:00:00 2001 From: jneira Date: Thu, 9 Apr 2020 22:53:58 +0200 Subject: [PATCH 21/21] Drop ghc-8.8.3 from azure stack jobs --- .azure/windows-stack.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.azure/windows-stack.yml b/.azure/windows-stack.yml index b13a39d6a..7f2e090ed 100644 --- a/.azure/windows-stack.yml +++ b/.azure/windows-stack.yml @@ -13,8 +13,6 @@ jobs: # due to https://gitlab.haskell.org/ghc/ghc/issues/17575 # ghc-8.8.3 throws segfaults in ci envs so we can't use it neither # due to https://gitlab.haskell.org/ghc/ghc/issues/17926 - stack-8.8.3: - YAML_FILE: stack-8.8.3.yaml stack-8.6.5: YAML_FILE: stack-8.6.5.yaml stack-8.6.4: