Skip to content

Commit fc622f5

Browse files
hasufellhasufell
committed
Fix CI
1 parent 7d983de commit fc622f5

File tree

8 files changed

+997
-3881
lines changed

8 files changed

+997
-3881
lines changed

‎.github/scripts/build.sh‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,4 +64,3 @@ case "$(uname)" in
6464
;;
6565
esac
6666

67-

‎.github/scripts/common.sh‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -137,9 +137,6 @@ install_ghcup() {
137137
else
138138
curl --proto '=https' --tlsv1.2 -sSf https://get-ghcup.haskell.org | BOOTSTRAP_HASKELL_MINIMAL=1 sh
139139
source "$(dirname "${GHCUP_BIN}")/env"
140-
# make sure we use the vanilla channel for installing binaries
141-
# see https://github.com/haskell/ghcup-metadata/pull/166#issuecomment-1893075575
142-
ghcup config set url-source https://raw.githubusercontent.com/haskell/ghcup-metadata/refs/heads/master/ghcup-vanilla-0.0.9.yaml
143140
ghcup install cabal --set "${BOOTSTRAP_HASKELL_CABAL_VERSION}"
144141
fi
145142
}

‎.github/scripts/env.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ fi
1111
export PATH="$HOME/.local/bin:$PATH"
1212

1313
export BOOTSTRAP_HASKELL_NONINTERACTIVE=1
14-
export BOOTSTRAP_HASKELL_CABAL_VERSION="${CABAL_VER:-3.10.3.0}"
14+
export BOOTSTRAP_HASKELL_CABAL_VERSION="${CABAL_VER:-3.14.1.1-p1}"
1515
export BOOTSTRAP_HASKELL_ADJUST_CABAL_CONFIG=no
1616
export BOOTSTRAP_HASKELL_INSTALL_NO_STACK=yes
1717
export BOOTSTRAP_HASKELL_ADJUST_BASHRC=1

‎.github/scripts/test.sh‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ test_all_hls() {
4949
bin_noexe=${bin/.exe/}
5050
if ! [[ "${bin_noexe}" =~ "haskell-language-server-wrapper" ]] && ! [[ "${bin_noexe}" =~ "~" ]] ; then
5151
if ghcup install ghc --set "${bin_noexe/haskell-language-server-/}" ; then
52+
cabal clean
5253
"${hls}" --debug typecheck "${test_module}" || fail "failed to typecheck with HLS for GHC ${bin_noexe/haskell-language-server-/}"
5354

5455
# After running the test, free up disk space by deleting the unneeded GHC version.
@@ -59,8 +60,8 @@ test_all_hls() {
5960
fi
6061
fi
6162
done
62-
# install the recommended GHC version so the wrapper can launch HLS
63-
ghcup install ghc --set 9.10.3
63+
ghcup install ghc --set recommended
64+
cabal clean
6465
"$bindir/haskell-language-server-wrapper${ext}" typecheck "${test_module}" || fail "failed to typecheck with HLS wrapper"
6566
}
6667

‎.github/workflows/release.yaml‎

Lines changed: 931 additions & 3824 deletions
Large diffs are not rendered by default.

‎GNUmakefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,7 @@ bindist-ghc:
138138
$(INSTALL_D) "$(BINDIST_OUT_DIR)/bin/"
139139
$(INSTALL_X) "out/$(ARTIFACT)/$(GHC_VERSION)/haskell-language-server-wrapper" "$(BINDIST_OUT_DIR)/bin/haskell-language-server-wrapper"
140140
$(INSTALL_D) "$(ROOT_DIR)/$(BINDIST_OUT_DIR)/lib/$(GHC_VERSION)"
141-
$(FIND) "$(STORE_DIR)/ghc-$(GHC_VERSION)" -type f -name "$(DLL)" -execdir $(INSTALL_X) "{}" "$(ROOT_DIR)/$(BINDIST_OUT_DIR)/lib/$(GHC_VERSION)/{}" \;
141+
$(FIND) "$(STORE_DIR)/ghc-$(GHC_VERSION)"* -type f -name "$(DLL)" -execdir $(INSTALL_X) "{}" "$(ROOT_DIR)/$(BINDIST_OUT_DIR)/lib/$(GHC_VERSION)/{}" \;
142142
$(FIND) "$(ROOT_DIR)/$(BINDIST_OUT_DIR)/lib/$(GHC_VERSION)" -type f -name '$(DLL)' -execdir $(call set_rpath,,{}) \;
143143

144144
version:

‎cabal.project‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ constraints:
4141
-- We want to be able to benefit from the performance optimisations
4242
-- in the future, thus: TODO: remove this flag.
4343
bitvec -simd,
44+
hashable -arch-native
4445

4546

4647
-- Some of the formatters need the latest Cabal-syntax version,

‎scripts/release/create-yaml-snippet.sh‎

Lines changed: 60 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ set -o pipefail
66
RELEASE=$1
77

88
cd "gh-release-artifacts/haskell-language-server-${RELEASE}"
9+
baseUrl="https://downloads.haskell.org/~ghcup/unofficial-bindists/haskell-language-server/$RELEASE"
910

1011
cat <<EOF > /dev/stdout
1112
$RELEASE:
@@ -14,94 +15,104 @@ cat <<EOF > /dev/stdout
1415
viChangeLog: https://github.com/haskell/haskell-language-server/blob/master/ChangeLog.md
1516
viPostInstall: *hls-post-install
1617
viSourceDL:
17-
dlUri: https://downloads.haskell.org/~hls/haskell-language-server-$RELEASE/haskell-language-server-$RELEASE-src.tar.gz
18+
dlUri: $baseUrl/haskell-language-server-$RELEASE-src.tar.gz
1819
dlSubdir: haskell-language-server-$RELEASE
1920
dlHash: $(sha256sum "haskell-language-server-$RELEASE-src.tar.gz" | awk '{ print $1 }')
2021
viArch:
2122
A_64:
2223
Linux_Debian:
23-
'< 10': &hls-${RELEASE//./}-64-deb9
24-
dlUri: https://downloads.haskell.org/~hls/haskell-language-server-$RELEASE/haskell-language-server-$RELEASE-x86_64-linux-deb9.tar.xz
25-
dlSubdir: haskell-language-server-$RELEASE
26-
dlHash: $(sha256sum "haskell-language-server-$RELEASE-x86_64-linux-deb9.tar.xz" | awk '{ print $1 }')
2724
'(>= 10 && < 11)': &hls-${RELEASE//./}-64-deb10
28-
dlUri: https://downloads.haskell.org/~hls/haskell-language-server-$RELEASE/haskell-language-server-$RELEASE-x86_64-linux-deb10.tar.xz
25+
dlUri: $baseUrl/haskell-language-server-$RELEASE-x86_64-linux-deb10.tar.xz
2926
dlSubdir: haskell-language-server-$RELEASE
3027
dlHash: $(sha256sum "haskell-language-server-$RELEASE-x86_64-linux-deb10.tar.xz" | awk '{ print $1 }')
3128
'(>= 11 && < 12)': &hls-${RELEASE//./}-64-deb11
32-
dlUri: https://downloads.haskell.org/~hls/haskell-language-server-$RELEASE/haskell-language-server-$RELEASE-x86_64-linux-deb11.tar.xz
29+
dlUri: $baseUrl/haskell-language-server-$RELEASE-x86_64-linux-deb11.tar.xz
3330
dlSubdir: haskell-language-server-$RELEASE
3431
dlHash: $(sha256sum "haskell-language-server-$RELEASE-x86_64-linux-deb11.tar.xz" | awk '{ print $1 }')
35-
'>= 12': &hls-${RELEASE//./}-64-deb12
36-
dlUri: https://downloads.haskell.org/~hls/haskell-language-server-$RELEASE/haskell-language-server-$RELEASE-x86_64-linux-deb12.tar.xz
32+
'(>= 12 && < 13)': &hls-${RELEASE//./}-64-deb12
33+
dlUri: $baseUrl/haskell-language-server-$RELEASE-x86_64-linux-deb12.tar.xz
3734
dlSubdir: haskell-language-server-$RELEASE
3835
dlHash: $(sha256sum "haskell-language-server-$RELEASE-x86_64-linux-deb12.tar.xz" | awk '{ print $1 }')
39-
unknown_versioning: &hls-${RELEASE//./}-64-deb11
40-
dlUri: https://downloads.haskell.org/~hls/haskell-language-server-$RELEASE/haskell-language-server-$RELEASE-x86_64-linux-deb11.tar.xz
41-
dlSubdir: haskell-language-server-$RELEASE
42-
dlHash: $(sha256sum "haskell-language-server-$RELEASE-x86_64-linux-deb11.tar.xz" | awk '{ print $1 }')
36+
unknown_versioning: *hls-${RELEASE//./}-64-deb12
4337
Linux_Ubuntu:
44-
'( >= 16 && < 19 )': &hls-${RELEASE//./}-64-ubuntu18
45-
dlUri: https://downloads.haskell.org/~hls/haskell-language-server-$RELEASE/haskell-language-server-$RELEASE-x86_64-linux-ubuntu1804.tar.xz
46-
dlSubdir: haskell-language-server-$RELEASE
47-
dlHash: $(sha256sum "haskell-language-server-$RELEASE-x86_64-linux-ubuntu1804.tar.xz" | awk '{ print $1 }')
4838
'( >= 20 && < 22 )': &hls-${RELEASE//./}-64-ubuntu20
49-
dlUri: https://downloads.haskell.org/~hls/haskell-language-server-$RELEASE/haskell-language-server-$RELEASE-x86_64-linux-ubuntu2004.tar.xz
39+
dlUri: $baseUrl/haskell-language-server-$RELEASE-x86_64-linux-ubuntu20.04.tar.xz
5040
dlSubdir: haskell-language-server-$RELEASE
51-
dlHash: $(sha256sum "haskell-language-server-$RELEASE-x86_64-linux-ubuntu2004.tar.xz" | awk '{ print $1 }')
52-
unknown_versioning: &hls-${RELEASE//./}-64-ubuntu22
53-
dlUri: https://downloads.haskell.org/~hls/haskell-language-server-$RELEASE/haskell-language-server-$RELEASE-x86_64-linux-ubuntu2204.tar.xz
41+
dlHash: $(sha256sum "haskell-language-server-$RELEASE-x86_64-linux-ubuntu20.04.tar.xz" | awk '{ print $1 }')
42+
'( >= 22 && < 23 )': &hls-${RELEASE//./}-64-ubuntu22
43+
dlUri: $baseUrl/haskell-language-server-$RELEASE-x86_64-linux-ubuntu22.04.tar.xz
5444
dlSubdir: haskell-language-server-$RELEASE
55-
dlHash: $(sha256sum "haskell-language-server-$RELEASE-x86_64-linux-ubuntu2204.tar.xz" | awk '{ print $1 }')
56-
Linux_Mint:
57-
'< 20':
58-
dlUri: https://downloads.haskell.org/~hls/haskell-language-server-$RELEASE/haskell-language-server-$RELEASE-x86_64-linux-mint193.tar.xz
45+
dlHash: $(sha256sum "haskell-language-server-$RELEASE-x86_64-linux-ubuntu22.04.tar.xz" | awk '{ print $1 }')
46+
'( >= 24 && < 25 )': &hls-${RELEASE//./}-64-ubuntu24
47+
dlUri: $baseUrl/haskell-language-server-$RELEASE-x86_64-linux-ubuntu24.04.tar.xz
5948
dlSubdir: haskell-language-server-$RELEASE
60-
dlHash: $(sha256sum "haskell-language-server-$RELEASE-x86_64-linux-mint193.tar.xz" | awk '{ print $1 }')
61-
'(>= 20 && < 21)':
62-
dlUri: https://downloads.haskell.org/~hls/haskell-language-server-$RELEASE/haskell-language-server-$RELEASE-x86_64-linux-mint202.tar.xz
49+
dlHash: $(sha256sum "haskell-language-server-$RELEASE-x86_64-linux-ubuntu24.04.tar.xz" | awk '{ print $1 }')
50+
unknown_versioning: *hls-${RELEASE//./}-64-ubuntu22
51+
Linux_Mint:
52+
'(>= 20 && < 21)': &hls-${RELEASE//./}-64-mint20
53+
dlUri: $baseUrl/haskell-language-server-$RELEASE-x86_64-linux-mint20.3.tar.xz
6354
dlSubdir: haskell-language-server-$RELEASE
64-
dlHash: $(sha256sum "haskell-language-server-$RELEASE-x86_64-linux-mint202.tar.xz" | awk '{ print $1 }')
65-
'>= 21':
66-
dlUri: https://downloads.haskell.org/~hls/haskell-language-server-$RELEASE/haskell-language-server-$RELEASE-x86_64-linux-mint213.tar.xz
55+
dlHash: $(sha256sum "haskell-language-server-$RELEASE-x86_64-linux-mint20.3.tar.xz" | awk '{ print $1 }')
56+
'(>= 21 && < 22)': &hls-${RELEASE//./}-64-mint21
57+
dlUri: $baseUrl/haskell-language-server-$RELEASE-x86_64-linux-mint21.3.tar.xz
6758
dlSubdir: haskell-language-server-$RELEASE
68-
dlHash: $(sha256sum "haskell-language-server-$RELEASE-x86_64-linux-mint213.tar.xz" | awk '{ print $1 }')
59+
dlHash: $(sha256sum "haskell-language-server-$RELEASE-x86_64-linux-mint21.3.tar.xz" | awk '{ print $1 }')
60+
unknown_versioning: *hls-${RELEASE//./}-64-mint21
6961
Linux_Fedora:
70-
'(>= 33 && < 40)': &hls-${RELEASE//./}-64-fedora33
71-
dlUri: https://downloads.haskell.org/~hls/haskell-language-server-$RELEASE/haskell-language-server-$RELEASE-x86_64-linux-fedora33.tar.xz
62+
'(>= 33 && < 38)': &hls-${RELEASE//./}-64-fedora33
63+
dlUri: $baseUrl/haskell-language-server-$RELEASE-x86_64-linux-fedora33.tar.xz
7264
dlSubdir: haskell-language-server-$RELEASE
7365
dlHash: $(sha256sum "haskell-language-server-$RELEASE-x86_64-linux-fedora33.tar.xz" | awk '{ print $1 }')
74-
'>= 40': &hls-${RELEASE//./}-64-fedora40
75-
dlUri: https://downloads.haskell.org/~hls/haskell-language-server-$RELEASE/haskell-language-server-$RELEASE-x86_64-linux-fedora40.tar.xz
66+
'>= 38':
67+
dlUri: $baseUrl/haskell-language-server-$RELEASE-x86_64-linux-fedora38.tar.xz
7668
dlSubdir: haskell-language-server-$RELEASE
77-
dlHash: $(sha256sum "haskell-language-server-$RELEASE-x86_64-linux-fedora40.tar.xz" | awk '{ print $1 }')
78-
unknown_versioning: *hls-${RELEASE//./}-64-unknown
69+
dlHash: $(sha256sum "haskell-language-server-$RELEASE-x86_64-linux-fedora38.tar.xz" | awk '{ print $1 }')
70+
unknown_versioning: *hls-${RELEASE//./}-64-fedora33
71+
Linux_Rocky:
72+
'( >= 8 && < 9 )': &hls-${RELEASE//./}-64-rocky8
73+
dlUri: $baseUrl/haskell-language-server-$RELEASE-x86_64-linux-rocky8.tar.xz
74+
dlSubdir: haskell-language-server-$RELEASE
75+
dlHash: $(sha256sum "haskell-language-server-$RELEASE-x86_64-linux-rocky8.tar.xz" | awk '{ print $1 }')
76+
'( >= 9 && < 10 )': &hls-${RELEASE//./}-64-rocky9
77+
dlUri: $baseUrl/haskell-language-server-$RELEASE-x86_64-linux-rocky9.tar.xz
78+
dlSubdir: haskell-language-server-$RELEASE
79+
dlHash: $(sha256sum "haskell-language-server-$RELEASE-x86_64-linux-rocky9.tar.xz" | awk '{ print $1 }')
80+
unknown_versioning: *hls-${RELEASE//./}-64-rocky9
7981
Linux_UnknownLinux:
80-
unknown_versioning: &hls-${RELEASE//./}-64-unknown
81-
dlUri: https://downloads.haskell.org/~hls/haskell-language-server-$RELEASE/haskell-language-server-$RELEASE-x86_64-linux-unknown.tar.xz
82+
unknown_versioning: *hls-${RELEASE//./}-64-rocky8
83+
Linux_Alpine:
84+
( >= 3.12 && < 3.18 ):
85+
dlUri: $baseUrl/haskell-language-server-$RELEASE-x86_64-linux-alpine312.tar.xz
86+
dlSubdir: haskell-language-server-$RELEASE
87+
dlHash: $(sha256sum "haskell-language-server-$RELEASE-x86_64-linux-alpine312.tar.xz" | awk '{ print $1 }')
88+
'>= 3.18': &hls-${RELEASE//./}-64-alpine3_18
89+
dlUri: $baseUrl/haskell-language-server-$RELEASE-x86_64-linux-alpine318.tar.xz
8290
dlSubdir: haskell-language-server-$RELEASE
83-
dlHash: $(sha256sum "haskell-language-server-$RELEASE-x86_64-linux-unknown.tar.xz" | awk '{ print $1 }')
84-
Linux_RedHat:
85-
unknown_versioning: *hls-${RELEASE//./}-64-unknown
91+
dlHash: $(sha256sum "haskell-language-server-$RELEASE-x86_64-linux-alpine318.tar.xz" | awk '{ print $1 }')
92+
unknown_versioning: *hls-${RELEASE//./}-64-alpine3_18
8693
Darwin:
8794
unknown_versioning:
88-
dlUri: https://downloads.haskell.org/~hls/haskell-language-server-$RELEASE/haskell-language-server-$RELEASE-x86_64-apple-darwin.tar.xz
95+
dlUri: $baseUrl/haskell-language-server-$RELEASE-x86_64-apple-darwin.tar.xz
8996
dlSubdir: haskell-language-server-$RELEASE
9097
dlHash: $(sha256sum "haskell-language-server-$RELEASE-x86_64-apple-darwin.tar.xz" | awk '{ print $1 }')
9198
Windows:
9299
unknown_versioning:
93-
dlUri: https://downloads.haskell.org/~hls/haskell-language-server-$RELEASE/haskell-language-server-$RELEASE-x86_64-mingw64.zip
100+
dlUri: $baseUrl/haskell-language-server-$RELEASE-x86_64-mingw64.zip
94101
dlHash: $(sha256sum "haskell-language-server-$RELEASE-x86_64-mingw64.zip" | awk '{ print $1 }')
102+
FreeBSD:
103+
unknown_versioning:
104+
dlUri: $baseUrl/haskell-language-server-$RELEASE-x86_64-portbld-freebsd.tar.xz
105+
dlSubdir: haskell-language-server-$RELEASE
106+
dlHash: $(sha256sum "haskell-language-server-$RELEASE-x86_64-portbld-freebsd.tar.xz" | awk '{ print $1 }')
95107
A_ARM64:
96108
Linux_UnknownLinux:
97109
unknown_versioning:
98-
dlUri: https://downloads.haskell.org/~hls/haskell-language-server-$RELEASE/haskell-language-server-$RELEASE-aarch64-linux-ubuntu2004.tar.xz
110+
dlUri: $baseUrl/haskell-language-server-$RELEASE-aarch64-linux-deb10.tar.xz
99111
dlSubdir: haskell-language-server-$RELEASE
100-
dlHash: $(sha256sum "haskell-language-server-$RELEASE-aarch64-linux-ubuntu2004.tar.xz" | awk '{ print $1 }')
112+
dlHash: $(sha256sum "haskell-language-server-$RELEASE-aarch64-linux-deb10.tar.xz" | awk '{ print $1 }')
101113
Darwin:
102114
unknown_versioning:
103-
dlUri: https://downloads.haskell.org/~hls/haskell-language-server-$RELEASE/haskell-language-server-$RELEASE-aarch64-apple-darwin.tar.xz
115+
dlUri: $baseUrl/haskell-language-server-$RELEASE-aarch64-apple-darwin.tar.xz
104116
dlSubdir: haskell-language-server-$RELEASE
105117
dlHash: $(sha256sum "haskell-language-server-$RELEASE-aarch64-apple-darwin.tar.xz" | awk '{ print $1 }')
106118
EOF
107-

0 commit comments

Comments
 (0)