Skip to content

Commit a538641

Browse files
pepeiborrapepeiborra
authored
Target GHC 9.2.2 (#2787)
* Target GHC 9.2.2 * fix with-compiler * attempt to fix Mac build * attempt to fix stack * Apply @July541 suggestion * add missing space * fix yaml * another yaml fix
1 parent a832491 commit a538641

File tree

11 files changed

+39
-26
lines changed

11 files changed

+39
-26
lines changed

‎.circleci/config.yml

+5-3
Original file line numberDiff line numberDiff line change
@@ -105,9 +105,11 @@ jobs:
105105
- STACK_FILE: "stack-9.0.2.yaml"
106106
<<: *defaults
107107

108-
ghc-9.2.1:
108+
ghc-9.2.2:
109109
environment:
110-
- STACK_FILE: "stack-9.2.1.yaml"
110+
# https://github.com/digital-asset/ghc-lib/issues/352
111+
- CPATH: "/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/ffi:$CPATH"
112+
- STACK_FILE: "stack-9.2.yaml"
111113
<<: *defaults
112114

113115
ghc-default:
@@ -126,5 +128,5 @@ workflows:
126128
- ghc-8.10.7
127129
- ghc-9.0.1
128130
- ghc-9.0.2
129-
- ghc-9.2.1
131+
- ghc-9.2.2
130132
- ghc-default

‎.github/workflows/caching.yml

+4-1
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ jobs:
8080
strategy:
8181
fail-fast: false
8282
matrix:
83-
ghc: [ "9.2.1"
83+
ghc: [ "9.2.2"
8484
, "9.0.2"
8585
, "9.0.1"
8686
, "8.10.7"
@@ -116,6 +116,9 @@ jobs:
116116
run: |
117117
# repeating builds to workaround segfaults in windows and ghc-8.8.4
118118
cabal $cabalBuild || cabal $cabalBuild || cabal $cabalBuild
119+
env:
120+
# needed for GHC 9.2.2 https://github.com/digital-asset/ghc-lib/issues/352
121+
CPATH:"/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/ffi":$CPATH
119122

120123
# We build ghcide with benchs and test enabled to include its dependencies in the cache
121124
# (including shake-bench)

‎.github/workflows/flags.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
strategy:
4545
fail-fast: true
4646
matrix:
47-
ghc: [ "9.2.1"
47+
ghc: [ "9.2.2"
4848
, "9.0.2"
4949
, "8.10.7"
5050
, "8.8.4"
@@ -72,7 +72,7 @@ jobs:
7272
run: cabal v2-build ghcide --flags="ghc-patched-unboxed-bytecode test-exe executable bench-exe"
7373

7474
# we have to clean up warnings for 9.0 and 9.2 before enable -WAll
75-
- if: matrix.ghc != '9.0.2' && matrix.ghc != '9.2.1'
75+
- if: matrix.ghc != '9.0.2' && matrix.ghc != '9.2.2'
7676
name: Build with pedantic (-WError)
7777
run: cabal v2-build --flags="pedantic"
7878

‎.github/workflows/test.yml

+13-10
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ jobs:
5757
strategy:
5858
fail-fast: true
5959
matrix:
60-
ghc: [ "9.2.1"
60+
ghc: [ "9.2.2"
6161
, "9.0.2"
6262
, "9.0.1"
6363
, "8.10.7"
@@ -71,7 +71,7 @@ jobs:
7171
include:
7272
# only test supported ghc major versions
7373
- os: ubuntu-latest
74-
ghc: '9.2.1'
74+
ghc: '9.2.2'
7575
test: true
7676
- os: ubuntu-latest
7777
ghc: '9.0.2'
@@ -86,7 +86,7 @@ jobs:
8686
ghc: '8.6.5'
8787
test: true
8888
- os: windows-latest
89-
ghc: '9.2.1'
89+
ghc: '9.2.2'
9090
test: true
9191
- os: windows-latest
9292
ghc: '9.0.2'
@@ -115,6 +115,9 @@ jobs:
115115

116116
# repeating builds to workaround segfaults in windows and ghc-8.8.4
117117
- name: Build
118+
# needed for GHC 9.2.2 https://github.com/digital-asset/ghc-lib/issues/352
119+
env:
120+
CPATH: "/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/ffi:$CPATH"
118121
run: cabal build || cabal build || cabal build
119122

120123
- name: Set test options
@@ -159,7 +162,7 @@ jobs:
159162
HLS_WRAPPER_TEST_EXE: hls-wrapper
160163
run: cabal test wrapper-test --test-options="$TEST_OPTS --rerun-log-file .tasty-rerun-log-wrapper" || cabal test wrapper-test --test-options="$TEST_OPTS --rerun-log-file .tasty-rerun-log-wrapper" || cabal test wrapper-test --test-options="$TEST_OPTS --rerun-log-file .tasty-rerun-log-wrapper"
161164

162-
- if: matrix.test && matrix.ghc != '9.2.1'
165+
- if: matrix.test && matrix.ghc != '9.2.2'
163166
name: Test hls-brittany-plugin
164167
run: cabal test hls-brittany-plugin --test-options="$TEST_OPTS" || cabal test hls-brittany-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-brittany-plugin --test-options="$TEST_OPTS"
165168

@@ -175,19 +178,19 @@ jobs:
175178
name: Test hls-pragmas-plugin
176179
run: cabal test hls-pragmas-plugin --test-options="$TEST_OPTS" || cabal test hls-pragmas-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-pragmas-plugin --test-options="$TEST_OPTS"
177180

178-
- if: matrix.test && matrix.ghc != '9.2.1'
181+
- if: matrix.test && matrix.ghc != '9.2.2'
179182
name: Test hls-eval-plugin
180183
run: cabal test hls-eval-plugin --test-options="$TEST_OPTS" || cabal test hls-eval-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-eval-plugin --test-options="$TEST_OPTS"
181184

182-
- if: matrix.test && matrix.ghc != '9.2.1'
185+
- if: matrix.test && matrix.ghc != '9.2.2'
183186
name: Test hls-haddock-comments-plugin
184187
run: cabal test hls-haddock-comments-plugin --test-options="$TEST_OPTS" || cabal test hls-haddock-comments-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-haddock-comments-plugin --test-options="$TEST_OPTS"
185188

186-
- if: matrix.test && matrix.ghc != '9.2.1'
189+
- if: matrix.test && matrix.ghc != '9.2.2'
187190
name: Test hls-splice-plugin
188191
run: cabal test hls-splice-plugin --test-options="$TEST_OPTS" || cabal test hls-splice-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-splice-plugin --test-options="$TEST_OPTS"
189192

190-
- if: matrix.test && matrix.ghc != '9.0.1' && matrix.ghc != '9.0.2' && matrix.ghc != '9.2.1'
193+
- if: matrix.test && matrix.ghc != '9.0.1' && matrix.ghc != '9.0.2' && matrix.ghc != '9.2.2'
191194
name: Test hls-stylish-haskell-plugin
192195
run: cabal test hls-stylish-haskell-plugin --test-options="$TEST_OPTS" || cabal test hls-stylish-haskell-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-stylish-haskell-plugin --test-options="$TEST_OPTS"
193196

@@ -199,7 +202,7 @@ jobs:
199202
name: Test hls-fourmolu-plugin
200203
run: cabal test hls-fourmolu-plugin --test-options="$TEST_OPTS" || cabal test hls-fourmolu-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-fourmolu-plugin --test-options="$TEST_OPTS"
201204

202-
- if: matrix.test && matrix.ghc != '9.2.1'
205+
- if: matrix.test && matrix.ghc != '9.2.2'
203206
name: Test hls-tactics-plugin test suite
204207
run: cabal test hls-tactics-plugin --test-options="$TEST_OPTS" || cabal test hls-tactics-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-tactics-plugin --test-options="$TEST_OPTS"
205208

@@ -219,7 +222,7 @@ jobs:
219222
name: Test hls-rename-plugin test suite
220223
run: cabal test hls-rename-plugin --test-options="$TEST_OPTS" || cabal test hls-rename-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-rename-plugin --test-options="$TEST_OPTS"
221224

222-
- if: matrix.test && matrix.ghc != '9.2.1'
225+
- if: matrix.test && matrix.ghc != '9.2.2'
223226
name: Test hls-hlint-plugin test suite
224227
run: cabal test hls-hlint-plugin --test-options="$TEST_OPTS" || cabal test hls-hlint-plugin --test-options="$TEST_OPTS" || LSP_TEST_LOG_COLOR=0 LSP_TEST_LOG_MESSAGES=true LSP_TEST_LOG_STDERR=true cabal test hls-hlint-plugin --test-options="$TEST_OPTS"
225228

‎.gitlab-ci.yml

+7-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ variables:
1919
CABAL_PROJECT: cabal.project
2020
- GHC_VERSION: 9.0.2
2121
CABAL_PROJECT: cabal-ghc90.project
22-
- GHC_VERSION: 9.2.1
22+
- GHC_VERSION: 9.2.2
2323
CABAL_PROJECT: cabal-ghc921.project
2424

2525
workflow:
@@ -419,8 +419,10 @@ build-x86_64-darwin:
419419
ADD_CABAL_ARGS: ""
420420
before_script:
421421
- /bin/bash ./.gitlab/brew.sh autoconf automake coreutils make tree
422+
# CPATH https://github.com/digital-asset/ghc-lib/issues/352
422423
script: |
423424
export PATH="$CI_PROJECT_DIR/.brew/bin:$CI_PROJECT_DIR/.brew/sbin:$PATH"
425+
export CPATH="/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/ffi:$CPATH"
424426
/bin/bash ./.gitlab/ci.sh
425427
after_script:
426428
- rm -Rf /private/tmp/.brew_tmp
@@ -469,6 +471,7 @@ build-aarch64-darwin:
469471
- export HOMEBREW_CHANGE_ARCH_TO_ARM=1
470472
- arch -arm64 /bin/bash ./.gitlab/brew.sh llvm autoconf automake coreutils make tree
471473
# C_INCLUDE_PATH: https://gitlab.haskell.org/ghc/ghc/-/issues/20592
474+
# CPATH https://github.com/digital-asset/ghc-lib/issues/352
472475
script: |
473476
export PATH="$CI_PROJECT_DIR/.brew/opt/llvm/bin:$CI_PROJECT_DIR/.brew/bin:$CI_PROJECT_DIR/.brew/sbin:$PATH"
474477
export CC=$CI_PROJECT_DIR/.brew/opt/llvm/bin/clang
@@ -477,6 +480,7 @@ build-aarch64-darwin:
477480
export AR=$CI_PROJECT_DIR/.brew/opt/llvm/bin/llvm-ar
478481
export RANLIB=$CI_PROJECT_DIR/.brew/opt/llvm/bin/llvm-ranlib
479482
export C_INCLUDE_PATH="`xcrun --show-sdk-path`/usr/include/ffi"
483+
export CPATH="/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/ffi:$CPATH"
480484
arch -arm64 /bin/bash ./.gitlab/ci.sh
481485
after_script:
482486
- rm -Rf /private/tmp/.brew_tmp
@@ -505,9 +509,11 @@ test-aarch64-darwin:
505509
- export HOMEBREW_CHANGE_ARCH_TO_ARM=1
506510
- arch -arm64 /bin/bash ./.gitlab/brew.sh make tree
507511
# C_INCLUDE_PATH: https://gitlab.haskell.org/ghc/ghc/-/issues/20592
512+
# CPATH https://github.com/digital-asset/ghc-lib/issues/352
508513
script: |
509514
export PATH="$CI_PROJECT_DIR/.brew/opt/llvm/bin:$CI_PROJECT_DIR/.brew/bin:$CI_PROJECT_DIR/.brew/sbin:$PATH"
510515
export C_INCLUDE_PATH="`xcrun --show-sdk-path`/usr/include/ffi"
516+
export CPATH="/Library/Developer/CommandLineTools/SDKs/MacOSX.sdk/usr/include/ffi:$CPATH"
511517
arch -arm64 /bin/bash ./.gitlab/test.sh
512518
after_script:
513519
- rm -Rf /private/tmp/.brew_tmp

‎bindist/ghcs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
8.10.7,cabal.project
22
9.0.2,cabal-ghc90.project
3-
9.2.1,cabal-ghc921.project
3+
9.2.1,cabal-ghc92.project

‎cabal-ghc921.project renamed to ‎cabal-ghc92.project

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ packages:
2929
./plugins/hls-selection-range-plugin
3030
./plugins/hls-change-type-signature-plugin
3131

32-
with-compiler: ghc-9.2.1
32+
with-compiler: ghc-9.2.2
3333

3434
tests: true
3535

‎ghcide/src/Development/IDE/GHC/Compat/Outputable.hs

+1-1
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ type PsError = ErrMsg
164164
mkPrintUnqualifiedDefault :: HscEnv -> GlobalRdrEnv -> PrintUnqualified
165165
mkPrintUnqualifiedDefault env =
166166
#if MIN_VERSION_ghc(9,2,0)
167-
-- GHC 9.2.1 version
167+
-- GHC 9.2 version
168168
-- mkPrintUnqualified :: UnitEnv -> GlobalRdrEnv -> PrintUnqualified
169169
mkPrintUnqualified (hsc_unit_env env)
170170
#else

‎haskell-language-server.cabal

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ copyright: The Haskell IDE Team
1414
license: Apache-2.0
1515
license-file: LICENSE
1616
build-type: Simple
17-
tested-with: GHC == 8.6.5 || == 8.8.4 || == 8.10.6 || == 8.10.7 || == 9.0.1 || == 9.0.2 || == 9.2.1
17+
tested-with: GHC == 8.6.5 || == 8.8.4 || == 8.10.6 || == 8.10.7 || == 9.0.2 || == 9.2.2
1818
extra-source-files:
1919
README.md
2020
ChangeLog.md

‎plugins/hls-change-type-signature-plugin/test/Main.hs

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ testRegexTwo = testGroup "Regex Two" [
7474
where
7575
regex = errorMessageRegexes !! 1
7676

77-
-- test ghc-9.2.1 error message regex
77+
-- test ghc-9.2 error message regex
7878
testRegex921One :: TestTree
7979
testRegex921One = testGroup "Regex One" [
8080
regexTest "ghc921-error1.txt" regex True

‎stack-9.2.1.yaml renamed to ‎stack-9.2.yaml

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
resolver: nightly-2022-01-14
2-
compiler: ghc-9.2.1
2+
compiler: ghc-9.2.2
33

44
packages:
55
- .
@@ -46,8 +46,8 @@ extra-deps:
4646
- floskell-0.10.6
4747
- fourmolu-0.5.0.0
4848
- ghc-exactprint-1.4.1
49-
- ghc-lib-9.2.1.20220109
50-
- ghc-lib-parser-9.2.1.20220109
49+
- ghc-lib-9.2.2.20220307
50+
- ghc-lib-parser-9.2.2.20220307
5151
- ghc-lib-parser-ex-9.2.0.1
5252
- heapsize-0.3.0.1
5353
- hiedb-0.4.1.0
@@ -89,7 +89,6 @@ extra-deps:
8989
# boot libraries
9090
- Cabal-3.6.0.0
9191
- directory-1.3.6.2
92-
- ghc-boot-9.2.1
9392
- process-1.6.13.2
9493
- time-1.11.1.1
9594
- unix-2.7.2.2

0 commit comments

Comments
 (0)