Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

HLS 2.6.0.0 #166

Merged
merged 1 commit into from
Jan 15, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
96 changes: 95 additions & 1 deletion ghcup-vanilla-0.0.7.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5715,7 +5715,6 @@ ghcupDownloads:
dlHash: 74cfa47f961ac5607055ca2f400b471a535e7b982e910e187c7c1303b048eeaf
2.5.0.0:
viTags:
- Latest
- Recommended
viChangeLog: https://github.com/haskell/haskell-language-server/blob/master/ChangeLog.md
viPostInstall: *hls-post-install
Expand Down Expand Up @@ -5804,6 +5803,101 @@ ghcupDownloads:
dlUri: https://downloads.haskell.org/~hls/haskell-language-server-2.5.0.0/haskell-language-server-2.5.0.0-aarch64-apple-darwin.tar.xz
dlSubdir: haskell-language-server-2.5.0.0
dlHash: 2e5083ebf7fc9dd3c5aa31059f9336bec4407fffb21b93a20decb49e9cf880a4
2.6.0.0:
viTags:
- Latest
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In the vanilla channel, the policy used to be that Latest == Recommended. Why break this invariant?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Where is this documented?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nowhere, I guess.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In all the previous patches I've made, I've always added exactly the same things to both the vanilla and default yamls, including updating or not updating the Recommended tag.

Copy link
Member

@hasufell hasufell Jan 16, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, we should enforce reviews. I hope @runeksvendsen will give us a hand with that.

Edit: as well as improving documentation

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@hasufell I'm happy to assist in reviewing, but that requires that PRs be open for longer before being merged. Looks like this PR was merged less than 48 hours after being opened. I'm working part time on GHCup, so I don't have time every day to look at tickets/PRs.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@runeksvendsen yes... I started to enforce review through branch protection rules.

Previously I had signalled that WT can raise and merge PRs on their own, since it wasn't clear whether I'll continue to maintain things on my own or at all.

So no one is to blame here. We'll just switch things up from now on.

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Previously I had signalled that WT can raise and merge PRs on their own, since it wasn't clear whether I'll continue to maintain things on my own or at all.

Who/what is WT?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well-Typed

viChangeLog: https://github.com/haskell/haskell-language-server/blob/master/ChangeLog.md
viPostInstall: *hls-post-install
viSourceDL:
dlUri: https://downloads.haskell.org/~hls/haskell-language-server-2.6.0.0/haskell-language-server-2.6.0.0-src.tar.gz
dlSubdir: haskell-language-server-2.6.0.0
dlHash: 4e681a77a7c9aeb067fc6ef108266767611133b11481756fdc84098d4853bc03
viArch:
A_64:
Linux_Debian:
'< 10': &hls-2600-64-deb9
dlUri: https://downloads.haskell.org/~hls/haskell-language-server-2.6.0.0/haskell-language-server-2.6.0.0-x86_64-linux-deb9.tar.xz
dlSubdir: haskell-language-server-2.6.0.0
dlHash: 75c1b562dae6fde12908a1f49277f1122b84ea0f572ec534175bc88ba30d08e5
'(>= 10 && < 11)': &hls-2600-64-deb10
dlUri: https://downloads.haskell.org/~hls/haskell-language-server-2.6.0.0/haskell-language-server-2.6.0.0-x86_64-linux-deb10.tar.xz
dlSubdir: haskell-language-server-2.6.0.0
dlHash: 00f62b00f8faefbf5879d84525707d620720c3c33dc3fac88955c8ff454e908f
unknown_versioning: &hls-2600-64-deb11
dlUri: https://downloads.haskell.org/~hls/haskell-language-server-2.6.0.0/haskell-language-server-2.6.0.0-x86_64-linux-deb11.tar.xz
dlSubdir: haskell-language-server-2.6.0.0
dlHash: 6c43bc25f2c0c7d389fce42916931c9e225042b263908418342de0de5e20f55c
Linux_Ubuntu:
'( >= 16 && < 19 )': &hls-2600-64-ubuntu18
dlUri: https://downloads.haskell.org/~hls/haskell-language-server-2.6.0.0/haskell-language-server-2.6.0.0-x86_64-linux-ubuntu18.04.tar.xz
dlSubdir: haskell-language-server-2.6.0.0
dlHash: 22970ca92324b7d85ded4dffe0c96b1fee24a8d6cc9dc6635c866be5e76817ae
'( >= 20 && < 22 )': &hls-2600-64-ubuntu20
dlUri: https://downloads.haskell.org/~hls/haskell-language-server-2.6.0.0/haskell-language-server-2.6.0.0-x86_64-linux-ubuntu20.04.tar.xz
dlSubdir: haskell-language-server-2.6.0.0
dlHash: 7fc69359a68b1e26cf119b5dfca911f65d6f17f92cdc00a42368bcf641d91ae1
unknown_versioning: &hls-2600-64-ubuntu22
dlUri: https://downloads.haskell.org/~hls/haskell-language-server-2.6.0.0/haskell-language-server-2.6.0.0-x86_64-linux-ubuntu22.04.tar.xz
dlSubdir: haskell-language-server-2.6.0.0
dlHash: ef12ea3541837caffa4c542a786fa1c75a215e74673283895e78bb2ee42c4f5c
Linux_Mint:
'< 20':
dlUri: https://downloads.haskell.org/~hls/haskell-language-server-2.6.0.0/haskell-language-server-2.6.0.0-x86_64-linux-mint19.3.tar.xz
dlSubdir: haskell-language-server-2.6.0.0
dlHash: 6380794e30e1cd160a570523471bd4eb357fbedb0315092638830bebb5d911f6
'(>= 20 && < 21)':
dlUri: https://downloads.haskell.org/~hls/haskell-language-server-2.6.0.0/haskell-language-server-2.6.0.0-x86_64-linux-mint20.2.tar.xz
dlSubdir: haskell-language-server-2.6.0.0
dlHash: 8cfd87f928a40fcdebc2ed40407c9ffdc974fb3135de066b3250f542b46af727
'>= 21': *hls-2600-64-ubuntu22
Linux_Fedora:
'< 33': &hls-2600-64-fedora27
dlUri: https://downloads.haskell.org/~hls/haskell-language-server-2.6.0.0/haskell-language-server-2.6.0.0-x86_64-linux-fedora27.tar.xz
dlSubdir: haskell-language-server-2.6.0.0
dlHash: faf23c3276584577ebeef4e2f4d23b6f27bfb1921f9c3fb8d3a2f72fa5ce6c24
'>= 33': &hls-2600-64-fedora33
dlUri: https://downloads.haskell.org/~hls/haskell-language-server-2.6.0.0/haskell-language-server-2.6.0.0-x86_64-linux-fedora33.tar.xz
dlSubdir: haskell-language-server-2.6.0.0
dlHash: 10cbdeececd8c31f9367e8116d6e2d89469900340b9c999ffe84fb03bf31fab7
unknown_versioning: *hls-2600-64-fedora27
Linux_CentOS:
'( >= 7 && < 8 )': &hls-2600-64-centos
dlUri: https://downloads.haskell.org/~hls/haskell-language-server-2.6.0.0/haskell-language-server-2.6.0.0-x86_64-linux-centos7.tar.xz
dlSubdir: haskell-language-server-2.6.0.0
dlHash: 2c90d2c4525bf36936b0ef505760bf071cc4350fc9205146d54fbac2d2295085
unknown_versioning: *hls-2600-64-centos
Linux_RedHat:
unknown_versioning: *hls-2600-64-centos
Linux_UnknownLinux:
unknown_versioning:
dlUri: https://downloads.haskell.org/~hls/haskell-language-server-2.6.0.0/haskell-language-server-2.6.0.0-x86_64-linux-unknown.tar.xz
dlSubdir: haskell-language-server-2.6.0.0
dlHash: 9341212f1b9215394dca18fa47e19820728ac62002c28438c1a628089446c22c
Darwin:
unknown_versioning:
dlUri: https://downloads.haskell.org/~hls/haskell-language-server-2.6.0.0/haskell-language-server-2.6.0.0-x86_64-apple-darwin.tar.xz
dlSubdir: haskell-language-server-2.6.0.0
dlHash: da96a6bfd30b5a6daee21d712304bd3732a4f1a94956a478720bc6652fbde9ea
Windows:
unknown_versioning:
dlUri: https://downloads.haskell.org/~hls/haskell-language-server-2.6.0.0/haskell-language-server-2.6.0.0-x86_64-mingw64.zip
dlHash: 6ba6eb86d0936ab3e5639b928c43d69990087ea68a801c9b816a98d3d2312d43
FreeBSD:
unknown_versioning:
dlUri: https://downloads.haskell.org/~hls/haskell-language-server-2.6.0.0/haskell-language-server-2.6.0.0-x86_64-freebsd.tar.xz
dlSubdir: haskell-language-server-2.6.0.0
dlHash: 8d172261b2b2b2fb09572589b192245a5e306e34f3f4e2b92af4fdb565564a99
Comment on lines +5885 to +5889
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is erroneous.

The vanilla channel does not support the FreeBSD GHC versions that this HLS bindist supplies. You're building the HLS bindists against the main channel, but then add it to the vanilla-channel, which doesn't add up.

You have to build against the vanilla channel in HLS release CI, so that the configuration matches properly.

@michaelpj

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You have to build against the vanilla channel in HLS release CI, so that the configuration matches properly.

Then these bindists will only be usable by people using the vanilla channel. Why even build HLS bindists officially in that case? It seems like you are suggesting that ghcup will take the responsibility of building all HLS bindists.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Then these bindists will only be usable by people using the vanilla channel.

Well, the channel has to be self-consistent. It is an alternative to the default channel. It's not meant to be added on top of the default channel.

It seems like you are suggesting that ghcup will take the responsibility of building all HLS bindists.

Yes, that's what I'm planning to do: haskellfoundation/tech-proposals#61

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We will build HLS bindists against the vanilla channel next time, but it is basically impossible to distribute those bindists as switching channels is not safe.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is how all linux distributions with different sources work.

There is no plan to make more complicated abstractions to support users randomly switching between channels.

HLS already does ABI checks on startup.

GHCup maintainers discourage the use of the vanilla channel for reasons explained in the tech proposal.

A_ARM64:
Linux_UnknownLinux:
unknown_versioning:
dlUri: https://downloads.haskell.org/~hls/haskell-language-server-2.6.0.0/haskell-language-server-2.6.0.0-aarch64-linux-ubuntu20.tar.xz
dlSubdir: haskell-language-server-2.6.0.0
dlHash: e9da6357fc8d090a2d1bd204d83603e6f390dd8d1111b767f7ac29d0b756329c
Darwin:
unknown_versioning:
dlUri: https://downloads.haskell.org/~hls/haskell-language-server-2.6.0.0/haskell-language-server-2.6.0.0-aarch64-apple-darwin.tar.xz
dlSubdir: haskell-language-server-2.6.0.0
dlHash: 898c4f188ca3bc38a7cfd3a8302364fb0ae35c4252701770073825f6894cbabf
Stack:
2.5.1:
viTags:
Expand Down
Binary file modified ghcup-vanilla-0.0.7.yaml.sig
Binary file not shown.
96 changes: 95 additions & 1 deletion ghcup-vanilla-0.0.8.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5715,7 +5715,6 @@ ghcupDownloads:
dlHash: 74cfa47f961ac5607055ca2f400b471a535e7b982e910e187c7c1303b048eeaf
2.5.0.0:
viTags:
- Latest
- Recommended
viChangeLog: https://github.com/haskell/haskell-language-server/blob/master/ChangeLog.md
viPostInstall: *hls-post-install
Expand Down Expand Up @@ -5804,6 +5803,101 @@ ghcupDownloads:
dlUri: https://downloads.haskell.org/~hls/haskell-language-server-2.5.0.0/haskell-language-server-2.5.0.0-aarch64-apple-darwin.tar.xz
dlSubdir: haskell-language-server-2.5.0.0
dlHash: 2e5083ebf7fc9dd3c5aa31059f9336bec4407fffb21b93a20decb49e9cf880a4
2.6.0.0:
viTags:
- Latest
viChangeLog: https://github.com/haskell/haskell-language-server/blob/master/ChangeLog.md
viPostInstall: *hls-post-install
viSourceDL:
dlUri: https://downloads.haskell.org/~hls/haskell-language-server-2.6.0.0/haskell-language-server-2.6.0.0-src.tar.gz
dlSubdir: haskell-language-server-2.6.0.0
dlHash: 4e681a77a7c9aeb067fc6ef108266767611133b11481756fdc84098d4853bc03
viArch:
A_64:
Linux_Debian:
'< 10': &hls-2600-64-deb9
dlUri: https://downloads.haskell.org/~hls/haskell-language-server-2.6.0.0/haskell-language-server-2.6.0.0-x86_64-linux-deb9.tar.xz
dlSubdir: haskell-language-server-2.6.0.0
dlHash: 75c1b562dae6fde12908a1f49277f1122b84ea0f572ec534175bc88ba30d08e5
'(>= 10 && < 11)': &hls-2600-64-deb10
dlUri: https://downloads.haskell.org/~hls/haskell-language-server-2.6.0.0/haskell-language-server-2.6.0.0-x86_64-linux-deb10.tar.xz
dlSubdir: haskell-language-server-2.6.0.0
dlHash: 00f62b00f8faefbf5879d84525707d620720c3c33dc3fac88955c8ff454e908f
unknown_versioning: &hls-2600-64-deb11
dlUri: https://downloads.haskell.org/~hls/haskell-language-server-2.6.0.0/haskell-language-server-2.6.0.0-x86_64-linux-deb11.tar.xz
dlSubdir: haskell-language-server-2.6.0.0
dlHash: 6c43bc25f2c0c7d389fce42916931c9e225042b263908418342de0de5e20f55c
Linux_Ubuntu:
'( >= 16 && < 19 )': &hls-2600-64-ubuntu18
dlUri: https://downloads.haskell.org/~hls/haskell-language-server-2.6.0.0/haskell-language-server-2.6.0.0-x86_64-linux-ubuntu18.04.tar.xz
dlSubdir: haskell-language-server-2.6.0.0
dlHash: 22970ca92324b7d85ded4dffe0c96b1fee24a8d6cc9dc6635c866be5e76817ae
'( >= 20 && < 22 )': &hls-2600-64-ubuntu20
dlUri: https://downloads.haskell.org/~hls/haskell-language-server-2.6.0.0/haskell-language-server-2.6.0.0-x86_64-linux-ubuntu20.04.tar.xz
dlSubdir: haskell-language-server-2.6.0.0
dlHash: 7fc69359a68b1e26cf119b5dfca911f65d6f17f92cdc00a42368bcf641d91ae1
unknown_versioning: &hls-2600-64-ubuntu22
dlUri: https://downloads.haskell.org/~hls/haskell-language-server-2.6.0.0/haskell-language-server-2.6.0.0-x86_64-linux-ubuntu22.04.tar.xz
dlSubdir: haskell-language-server-2.6.0.0
dlHash: ef12ea3541837caffa4c542a786fa1c75a215e74673283895e78bb2ee42c4f5c
Linux_Mint:
'< 20':
dlUri: https://downloads.haskell.org/~hls/haskell-language-server-2.6.0.0/haskell-language-server-2.6.0.0-x86_64-linux-mint19.3.tar.xz
dlSubdir: haskell-language-server-2.6.0.0
dlHash: 6380794e30e1cd160a570523471bd4eb357fbedb0315092638830bebb5d911f6
'(>= 20 && < 21)':
dlUri: https://downloads.haskell.org/~hls/haskell-language-server-2.6.0.0/haskell-language-server-2.6.0.0-x86_64-linux-mint20.2.tar.xz
dlSubdir: haskell-language-server-2.6.0.0
dlHash: 8cfd87f928a40fcdebc2ed40407c9ffdc974fb3135de066b3250f542b46af727
'>= 21': *hls-2600-64-ubuntu22
Linux_Fedora:
'< 33': &hls-2600-64-fedora27
dlUri: https://downloads.haskell.org/~hls/haskell-language-server-2.6.0.0/haskell-language-server-2.6.0.0-x86_64-linux-fedora27.tar.xz
dlSubdir: haskell-language-server-2.6.0.0
dlHash: faf23c3276584577ebeef4e2f4d23b6f27bfb1921f9c3fb8d3a2f72fa5ce6c24
'>= 33': &hls-2600-64-fedora33
dlUri: https://downloads.haskell.org/~hls/haskell-language-server-2.6.0.0/haskell-language-server-2.6.0.0-x86_64-linux-fedora33.tar.xz
dlSubdir: haskell-language-server-2.6.0.0
dlHash: 10cbdeececd8c31f9367e8116d6e2d89469900340b9c999ffe84fb03bf31fab7
unknown_versioning: *hls-2600-64-fedora27
Linux_CentOS:
'( >= 7 && < 8 )': &hls-2600-64-centos
dlUri: https://downloads.haskell.org/~hls/haskell-language-server-2.6.0.0/haskell-language-server-2.6.0.0-x86_64-linux-centos7.tar.xz
dlSubdir: haskell-language-server-2.6.0.0
dlHash: 2c90d2c4525bf36936b0ef505760bf071cc4350fc9205146d54fbac2d2295085
unknown_versioning: *hls-2600-64-centos
Linux_RedHat:
unknown_versioning: *hls-2600-64-centos
Linux_UnknownLinux:
unknown_versioning:
dlUri: https://downloads.haskell.org/~hls/haskell-language-server-2.6.0.0/haskell-language-server-2.6.0.0-x86_64-linux-unknown.tar.xz
dlSubdir: haskell-language-server-2.6.0.0
dlHash: 9341212f1b9215394dca18fa47e19820728ac62002c28438c1a628089446c22c
Darwin:
unknown_versioning:
dlUri: https://downloads.haskell.org/~hls/haskell-language-server-2.6.0.0/haskell-language-server-2.6.0.0-x86_64-apple-darwin.tar.xz
dlSubdir: haskell-language-server-2.6.0.0
dlHash: da96a6bfd30b5a6daee21d712304bd3732a4f1a94956a478720bc6652fbde9ea
Windows:
unknown_versioning:
dlUri: https://downloads.haskell.org/~hls/haskell-language-server-2.6.0.0/haskell-language-server-2.6.0.0-x86_64-mingw64.zip
dlHash: 6ba6eb86d0936ab3e5639b928c43d69990087ea68a801c9b816a98d3d2312d43
FreeBSD:
unknown_versioning:
dlUri: https://downloads.haskell.org/~hls/haskell-language-server-2.6.0.0/haskell-language-server-2.6.0.0-x86_64-freebsd.tar.xz
dlSubdir: haskell-language-server-2.6.0.0
dlHash: 8d172261b2b2b2fb09572589b192245a5e306e34f3f4e2b92af4fdb565564a99
A_ARM64:
Linux_UnknownLinux:
unknown_versioning:
dlUri: https://downloads.haskell.org/~hls/haskell-language-server-2.6.0.0/haskell-language-server-2.6.0.0-aarch64-linux-ubuntu20.tar.xz
dlSubdir: haskell-language-server-2.6.0.0
dlHash: e9da6357fc8d090a2d1bd204d83603e6f390dd8d1111b767f7ac29d0b756329c
Darwin:
unknown_versioning:
dlUri: https://downloads.haskell.org/~hls/haskell-language-server-2.6.0.0/haskell-language-server-2.6.0.0-aarch64-apple-darwin.tar.xz
dlSubdir: haskell-language-server-2.6.0.0
dlHash: 898c4f188ca3bc38a7cfd3a8302364fb0ae35c4252701770073825f6894cbabf
Stack:
2.5.1:
viTags:
Expand Down
Binary file modified ghcup-vanilla-0.0.8.yaml.sig
Binary file not shown.
Loading