diff --git a/.github/actions/setup-build/action.yml b/.github/actions/setup-build/action.yml index f126941a90..fad1436de9 100644 --- a/.github/actions/setup-build/action.yml +++ b/.github/actions/setup-build/action.yml @@ -66,10 +66,10 @@ runs: - name: Retrieving `cabal.project` Hackage timestamp run: | - # Form: index-state: 2021-11-29T08:11:08Z - INDEX_STATE_ENTRY=$(grep index-state cabal.project) + # Form: index-state: repository 2021-11-29T08:11:08Z + INDEX_STATE_ENTRY=$(grep "index-state:" cabal.project) # Form: 2021-11-29T08-11-08Z - INDEX_STATE1=$(echo "$INDEX_STATE_ENTRY" | cut -d' ' -f2 | tr ':' '-') + INDEX_STATE1=$(echo "$INDEX_STATE_ENTRY" | cut -d' ' -f3 | tr ':' '-') echo "INDEX_STATE=$INDEX_STATE1" >> $GITHUB_ENV shell: bash diff --git a/cabal.project b/cabal.project index 75dbc2656b..3252fba8e0 100644 --- a/cabal.project +++ b/cabal.project @@ -34,7 +34,12 @@ packages: ./plugins/hls-refactor-plugin ./plugins/hls-overloaded-record-dot-plugin -index-state: 2023-10-06T06:12:29Z +-- head.hackage does not support index-state +-- (https://gitlab.haskell.org/ghc/head.hackage/-/issues/53) +-- Setting the index-state for head.hackage can result in +-- issues, e.g. https://github.com/haskell/haskell-language-server/issues/3861 +-- so we only set it for hackage. +index-state: hackage.haskell.org 2023-11-14T00:00:00Z tests: True test-show-details: direct diff --git a/ghcide/ghcide.cabal b/ghcide/ghcide.cabal index c4faae618a..123515787a 100644 --- a/ghcide/ghcide.cabal +++ b/ghcide/ghcide.cabal @@ -63,7 +63,7 @@ library enummapset, filepath, fingertree, - focus, + focus >= 1.0.3.2, ghc-trace-events, Glob, haddock-library >= 1.8 && < 1.12,