diff --git a/.github/workflows/workflow.yaml b/.github/workflows/workflow.yaml index 9e2fdc0..e213250 100644 --- a/.github/workflows/workflow.yaml +++ b/.github/workflows/workflow.yaml @@ -9,7 +9,7 @@ jobs: - arm64 ghc: - 9.0.2 - - 9.2.4 + - 9.2.5 - 9.4.2 runs-on: ubuntu-latest steps: @@ -34,7 +34,7 @@ jobs: matrix: ghc: - 9.0.2 - - 9.2.4 + - 9.2.5 - 9.4.2 runs-on: ubuntu-latest steps: diff --git a/Dockerfile b/Dockerfile index 7c75dd0..eb4be2b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -88,8 +88,8 @@ RUN \ ARG HLS_VERSION=1.8.0.0 RUN \ set -o errexit -o xtrace; \ - if test -n "$HLS_VERSION"; then \ - ghcup install hls "$HLS_VERSION" --set; \ + if test -n "$HLS_VERSION" && "$GHC_VERSION" == "9.2.5"; then \ + ghcup compile hls -g 5d56aa70a84807d7659e72eacd4d91fee08dbdbb --git-describe-version --ghc $GHC_VERSION --cabal-update --set; \ ghcup gc --hls-no-ghc; \ haskell-language-server-wrapper --version; \ fi diff --git a/aws/image.yaml b/aws/image.yaml index eaf21e2..1aa2a1c 100644 --- a/aws/image.yaml +++ b/aws/image.yaml @@ -5,7 +5,7 @@ env: DOCKER_USERNAME: docker-hub-read-only:DOCKER_USERNAME variables: AWS_REGION: us-east-1 - GHC_VERSION: 9.2.4 + GHC_VERSION: 9.2.5 phases: build: commands: diff --git a/aws/manifest.yaml b/aws/manifest.yaml index 979d287..ba56f12 100644 --- a/aws/manifest.yaml +++ b/aws/manifest.yaml @@ -2,7 +2,7 @@ version: 0.2 env: variables: AWS_REGION: us-east-1 - GHC_VERSION: 9.2.4 + GHC_VERSION: 9.2.5 phases: build: commands: