Skip to content

Commit c3f1c4a

Browse files
sloorushsloorush
authored
Merge branch 'haskell:master' into folding-ranges
2 parents 86f1068 + 0d21448 commit c3f1c4a

File tree

82 files changed

+905
-753
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

82 files changed

+905
-753
lines changed

‎.github/workflows/pre-commit.yml

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,24 @@ on:
66
branches: [master]
77

88
jobs:
9+
file-diff:
10+
runs-on: ubuntu-latest
11+
outputs:
12+
git-diff: ${{ steps.git-diff.outputs.diff }}
13+
steps:
14+
- name: Checkout code
15+
uses: actions/checkout@v3
16+
- name: Find changed files
17+
uses: technote-space/[email protected]
18+
id: git-diff
19+
with:
20+
PATTERNS: |
21+
+(src|exe|test|ghcide|plugins|hls-plugin-api|hie-compat|hls-graph|hls-test-utils)/**/*.hs
922
pre-commit:
1023
runs-on: ubuntu-latest
24+
needs: file-diff
1125
steps:
1226
- uses: actions/checkout@v3
13-
1427
- uses: ./.github/actions/setup-build
1528
with:
1629
os: ${{ runner.os }}
@@ -40,3 +53,5 @@ jobs:
4053
4154
- uses: actions/setup-python@v4
4255
- uses: pre-commit/[email protected]
56+
with:
57+
extra_args: --files ${{ needs.file-diff.outputs.git-diff }}

‎.gitlab-ci.yml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ stages:
77
# https://gitlab.haskell.org/haskell/haskell-language-server/-/pipelines
88
variables:
99
# Commit of ghc/ci-images repository from which to pull Docker images
10-
DOCKER_REV: "4ed1a4f27828ba96a34662dc954335e29b470cd2"
10+
DOCKER_REV: "9e4c540d9e4972a36291dfdf81f079f37d748890"
1111

1212
CABAL_INSTALL_VERSION: 3.8.1.0
1313

@@ -80,10 +80,10 @@ workflow:
8080
- x86_64-linux
8181
image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-centos7:$DOCKER_REV"
8282

83-
.x86_64-linux-fedora27:
83+
.x86_64-linux-fedora33:
8484
tags:
8585
- x86_64-linux
86-
image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-fedora27:$DOCKER_REV"
86+
image: "registry.gitlab.haskell.org/ghc/ci-images/x86_64-linux-fedora33:$DOCKER_REV"
8787

8888
.x86_64-linux-alpine:
8989
tags:
@@ -268,35 +268,35 @@ test-x86_64-linux-centos7:
268268
- sudo yum install -y tree
269269

270270
######################
271-
# x86_64 linux fedora27
271+
# x86_64 linux fedora33
272272
######################
273273

274-
build-x86_64-linux-fedora27:
274+
build-x86_64-linux-fedora33:
275275
extends:
276276
- .build
277-
- .x86_64-linux-fedora27
277+
- .x86_64-linux-fedora33
278278
before_script:
279279
- sudo dnf install -y patchelf tree
280280
variables:
281281
ADD_CABAL_ARGS: "--enable-split-sections"
282282

283-
tar-x86_64-linux-fedora27:
283+
tar-x86_64-linux-fedora33:
284284
extends:
285285
- .artifacts
286-
- .x86_64-linux-fedora27
286+
- .x86_64-linux-fedora33
287287
stage: tar
288-
needs: ["build-x86_64-linux-fedora27"]
288+
needs: ["build-x86_64-linux-fedora33"]
289289
script:
290290
- ./.gitlab/tar.sh
291291
variables:
292-
TARBALL_ARCHIVE_SUFFIX: x86_64-fedora27-linux
292+
TARBALL_ARCHIVE_SUFFIX: x86_64-fedora33-linux
293293
TARBALL_EXT: tar.xz
294294

295-
test-x86_64-linux-fedora27:
295+
test-x86_64-linux-fedora33:
296296
extends:
297297
- .test
298-
- .x86_64-linux-fedora27
299-
needs: ["tar-x86_64-linux-fedora27"]
298+
- .x86_64-linux-fedora33
299+
needs: ["tar-x86_64-linux-fedora33"]
300300
before_script:
301301
- sudo dnf install -y tree
302302

‎.gitlab/ci.sh

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ source "$CI_PROJECT_DIR/.gitlab/common.sh"
66

77
export GHCUP_INSTALL_BASE_PREFIX="$CI_PROJECT_DIR/toolchain"
88
export CABAL_DIR="$CI_PROJECT_DIR/cabal"
9-
EXE_EXTENSION = ""
9+
EXE_EXTENSION=""
1010

1111
case "$(uname)" in
1212
MSYS_*|MINGW*)
@@ -50,10 +50,10 @@ esac
5050
case "$(uname)" in
5151
MSYS_*|MINGW*)
5252
# workaround for https://gitlab.haskell.org/ghc/ghc/-/issues/21196
53-
export PATH="${GHCUP_INSTALL_BASE_PREFIX}/ghcup/ghc/${GHC_VERSION}/mingw/bin:${GHCUP_INSTALL_BASE_PREFIX}/ghcup/ghc/${GHC_VERSION}/mingw/usr/bin:$PATH"
54-
ls ${GHCUP_INSTALL_BASE_PREFIX}/ghcup/ghc/${GHC_VERSION}/mingw/bin
55-
cp ${GHCUP_INSTALL_BASE_PREFIX}/ghcup/ghc/${GHC_VERSION}/mingw/bin/libgcc_s_seh-1.dll ${GHCUP_INSTALL_BASE_PREFIX}/ghcup/ghc/${GHC_VERSION}/bin
56-
cp ${GHCUP_INSTALL_BASE_PREFIX}/ghcup/ghc/${GHC_VERSION}/mingw/bin/libwinpthread-1.dll ${GHCUP_INSTALL_BASE_PREFIX}/ghcup/ghc/${GHC_VERSION}/bin
53+
# export PATH="${GHCUP_INSTALL_BASE_PREFIX}/ghcup/ghc/${GHC_VERSION}/mingw/bin:${GHCUP_INSTALL_BASE_PREFIX}/ghcup/ghc/${GHC_VERSION}/mingw/usr/bin:$PATH"
54+
# ls ${GHCUP_INSTALL_BASE_PREFIX}/ghcup/ghc/${GHC_VERSION}/mingw/bin
55+
# cp ${GHCUP_INSTALL_BASE_PREFIX}/ghcup/ghc/${GHC_VERSION}/mingw/bin/libgcc_s_seh-1.dll ${GHCUP_INSTALL_BASE_PREFIX}/ghcup/ghc/${GHC_VERSION}/bin
56+
# cp ${GHCUP_INSTALL_BASE_PREFIX}/ghcup/ghc/${GHC_VERSION}/mingw/bin/libwinpthread-1.dll ${GHCUP_INSTALL_BASE_PREFIX}/ghcup/ghc/${GHC_VERSION}/bin
5757
ghc --info
5858
# Shorten binary names
5959
sed -i.bak -e 's/haskell-language-server/hls/g' \
@@ -76,10 +76,11 @@ case "$(uname)" in
7676

7777
mkdir "$CI_PROJECT_DIR/out"
7878

79-
cp "$(cabal list-bin ${args[@]} exe:hls)" "$CI_PROJECT_DIR/out/haskell-language-server-${GHC_VERSION}"$EXE_EXTENSION
80-
cp "$(cabal list-bin ${args[@]} exe:hls-wrapper)" "$CI_PROJECT_DIR/out/haskell-language-server-wrapper"$EXE_EXTENSION
79+
cp "$(cabal list-bin -v0 ${args[@]} exe:hls)" "$CI_PROJECT_DIR/out/haskell-language-server-${GHC_VERSION}"$EXE_EXTENSION
80+
cp "$(cabal list-bin -v0 ${args[@]} exe:hls-wrapper)" "$CI_PROJECT_DIR/out/haskell-language-server-wrapper"$EXE_EXTENSION
8181
;;
8282
*)
83+
sed -i.bak -e '/DELETE MARKER FOR CI/,/END DELETE/d' cabal.project # see comment in cabal.project
8384
emake --version
8485
emake GHCUP=ghcup hls
8586
emake GHCUP=ghcup bindist

‎.gitlab/test.sh

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -45,17 +45,17 @@ case "$(uname -s)" in
4545
;;
4646
esac
4747

48-
case "$(uname)" in
49-
MSYS_*|MINGW*)
50-
# workaround for https://gitlab.haskell.org/ghc/ghc/-/issues/21196
51-
export PATH="${GHCUP_INSTALL_BASE_PREFIX}/ghcup/ghc/${GHC_VERSION}/mingw/bin:${GHCUP_INSTALL_BASE_PREFIX}/ghcup/ghc/${GHC_VERSION}/mingw/usr/bin:$PATH"
52-
ls ${GHCUP_INSTALL_BASE_PREFIX}/ghcup/ghc/${GHC_VERSION}/mingw/bin
53-
cp ${GHCUP_INSTALL_BASE_PREFIX}/ghcup/ghc/${GHC_VERSION}/mingw/bin/libgcc_s_seh-1.dll ${GHCUP_INSTALL_BASE_PREFIX}/ghcup/ghc/${GHC_VERSION}/bin
54-
cp ${GHCUP_INSTALL_BASE_PREFIX}/ghcup/ghc/${GHC_VERSION}/mingw/bin/libwinpthread-1.dll ${GHCUP_INSTALL_BASE_PREFIX}/ghcup/ghc/${GHC_VERSION}/bin
55-
ghc --info
56-
;;
57-
*) ;;
58-
esac
48+
# case "$(uname)" in
49+
# MSYS_*|MINGW*)
50+
# # workaround for https://gitlab.haskell.org/ghc/ghc/-/issues/21196
51+
# export PATH="${GHCUP_INSTALL_BASE_PREFIX}/ghcup/ghc/${GHC_VERSION}/mingw/bin:${GHCUP_INSTALL_BASE_PREFIX}/ghcup/ghc/${GHC_VERSION}/mingw/usr/bin:$PATH"
52+
# ls ${GHCUP_INSTALL_BASE_PREFIX}/ghcup/ghc/${GHC_VERSION}/mingw/bin
53+
# cp ${GHCUP_INSTALL_BASE_PREFIX}/ghcup/ghc/${GHC_VERSION}/mingw/bin/libgcc_s_seh-1.dll ${GHCUP_INSTALL_BASE_PREFIX}/ghcup/ghc/${GHC_VERSION}/bin
54+
# cp ${GHCUP_INSTALL_BASE_PREFIX}/ghcup/ghc/${GHC_VERSION}/mingw/bin/libwinpthread-1.dll ${GHCUP_INSTALL_BASE_PREFIX}/ghcup/ghc/${GHC_VERSION}/bin
55+
# ghc --info
56+
# ;;
57+
# *) ;;
58+
# esac
5959

6060
# make sure out/ dir is gone, so build host rpaths don't
6161
# kick in (TODO: we should probably remove those)

0 commit comments

Comments
 (0)