diff --git a/.github/workflows/workflow.yaml b/.github/workflows/workflow.yaml index 2532acf..fad1a34 100644 --- a/.github/workflows/workflow.yaml +++ b/.github/workflows/workflow.yaml @@ -3,11 +3,12 @@ on: push jobs: docker: strategy: + fail-fast: false 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, hls: 830596ee212d4f2fbbc81bcf5d08574ae96947d3 } + - { ghc: 9.2.4, hls: 830596ee212d4f2fbbc81bcf5d08574ae96947d3 } + - { ghc: 9.4.2, hls: 830596ee212d4f2fbbc81bcf5d08574ae96947d3 } name: Docker with GHC ${{ matrix.ghc }} runs-on: ubuntu-latest steps: diff --git a/Dockerfile b/Dockerfile index 7c42042..a44455f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -89,8 +89,8 @@ ARG HLS_VERSION=1.7.0.0 RUN \ set -o errexit -o xtrace; \ if test -n "$HLS_VERSION"; then \ - ghcup install hls "$HLS_VERSION" --set; \ - ghcup gc --hls-no-ghc; \ + ghcup compile hls --cabal-update --ghc "$GHC_VERSION" --git-ref "$HLS_VERSION"; \ + rm --recursive /cabal-store/* ~/.cabal/logs ~/.cabal/packages; \ haskell-language-server-wrapper --version; \ fi