Skip to content

Commit c901ee0

Browse files
authored
Merge pull request #9 from acilearning/hls-1.8.0.0
Upgrade to HLS 1.8.0.0
2 parents 3d40f1c + 8827d79 commit c901ee0

File tree

3 files changed

+5
-7
lines changed

3 files changed

+5
-7
lines changed

.github/workflows/workflow.yaml

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ jobs:
55
strategy:
66
matrix:
77
include:
8-
- { ghc: 9.0.2, hls: 1.7.0.0 }
9-
- { ghc: 9.2.4, hls: '' }
10-
- { ghc: 9.4.2, hls: '' }
8+
- { ghc: 9.0.2 }
9+
- { ghc: 9.2.4 }
10+
- { ghc: 9.4.2 }
1111
name: Docker with GHC ${{ matrix.ghc }}
1212
runs-on: ubuntu-latest
1313
steps:
@@ -31,7 +31,6 @@ jobs:
3131
with:
3232
build-args: |
3333
GHC_VERSION=${{ matrix.ghc }}
34-
HLS_VERSION=${{ matrix.hls }}
3534
cache-from: type=gha
3635
cache-to: type=gha,mode=max
3736
labels: ${{ steps.meta.outputs.labels }}

Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ RUN \
5454

5555
# Install GHC.
5656

57-
ARG GHC_VERSION=9.0.2
57+
ARG GHC_VERSION=9.4.2
5858
RUN \
5959
set -o errexit -o xtrace; \
6060
if test -n "$GHC_VERSION"; then \
@@ -85,7 +85,7 @@ RUN \
8585

8686
# Install HLS.
8787

88-
ARG HLS_VERSION=1.7.0.0
88+
ARG HLS_VERSION=1.8.0.0
8989
RUN \
9090
set -o errexit -o xtrace; \
9191
if test -n "$HLS_VERSION"; then \

README.markdown

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,3 @@ This Docker image provides a Haskell development environment with the following
77
- [Cabal](https://www.haskell.org/cabal/)
88
- [Stack](https://docs.haskellstack.org/en/stable/README/)
99
- [HLS](https://haskell-language-server.readthedocs.io/en/latest/)
10-
- Note that HLS is not available for all versions of GHC.

0 commit comments

Comments
 (0)