diff --git a/.github/workflows/workflow.yaml b/.github/workflows/workflow.yaml index 2532acf..c5c0d31 100644 --- a/.github/workflows/workflow.yaml +++ b/.github/workflows/workflow.yaml @@ -5,9 +5,9 @@ jobs: strategy: matrix: include: - - { ghc: 9.0.2, hls: 1.7.0.0 } - - { ghc: 9.2.4, hls: '' } - - { ghc: 9.4.2, hls: '' } + - { ghc: 9.0.2 } + - { ghc: 9.2.4 } + - { ghc: 9.4.2 } name: Docker with GHC ${{ matrix.ghc }} runs-on: ubuntu-latest steps: @@ -31,7 +31,6 @@ jobs: with: build-args: | GHC_VERSION=${{ matrix.ghc }} - HLS_VERSION=${{ matrix.hls }} cache-from: type=gha cache-to: type=gha,mode=max labels: ${{ steps.meta.outputs.labels }} diff --git a/Dockerfile b/Dockerfile index 7c42042..c75dd58 100644 --- a/Dockerfile +++ b/Dockerfile @@ -54,7 +54,7 @@ RUN \ # Install GHC. -ARG GHC_VERSION=9.0.2 +ARG GHC_VERSION=9.4.2 RUN \ set -o errexit -o xtrace; \ if test -n "$GHC_VERSION"; then \ @@ -85,7 +85,7 @@ RUN \ # Install HLS. -ARG HLS_VERSION=1.7.0.0 +ARG HLS_VERSION=1.8.0.0 RUN \ set -o errexit -o xtrace; \ if test -n "$HLS_VERSION"; then \ diff --git a/README.markdown b/README.markdown index 1fc45d6..4165f87 100644 --- a/README.markdown +++ b/README.markdown @@ -7,4 +7,3 @@ This Docker image provides a Haskell development environment with the following - [Cabal](https://www.haskell.org/cabal/) - [Stack](https://docs.haskellstack.org/en/stable/README/) - [HLS](https://haskell-language-server.readthedocs.io/en/latest/) - - Note that HLS is not available for all versions of GHC.