Skip to content

Remove allow-newer for hiedb #4551

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Apr 8, 2025
Merged

Remove allow-newer for hiedb #4551

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d480903
Remove allow-newer for hiedb
jhrcek Apr 8, 2025
a7775af
Update and prune stack.yamls
jhrcek Apr 8, 2025
6bb11d0
Update docker images in stack CI config
jhrcek Apr 8, 2025
2915623
Use more general image tags, use bullseye
jhrcek Apr 8, 2025
34dc235
9.8.4 is not nightly anymore, pin patch version again
jhrcek Apr 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,14 +60,14 @@ version: 2
jobs:
stackage-lts22:
docker:
- image: haskell:9.6.5-slim-buster
- image: haskell:9.6.6-slim-bullseye
environment:
- STACK_FILE: "stack-lts22.yaml"
<<: *defaults

stackage-nightly:
stackage-lts23:
docker:
- image: haskell:9.8.2-slim-buster
- image: haskell:9.8.4-slim-bullseye
environment:
- STACK_FILE: "stack.yaml"
<<: *defaults
Expand All @@ -77,4 +77,4 @@ workflows:
multiple-ghcs:
jobs:
- stackage-lts22
- stackage-nightly
- stackage-lts23
Copy link
Collaborator Author

@jhrcek jhrcek Apr 8, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the current stackage nightly is using ghc-9.10.1.

So I renamed the job to lts-23 (based on ghc-8.10.4) to reflect reality of the current stack.yaml.
But now repo settings is expecting stackage-nightly job that doesn't exist.

To fix this we can:

  • bump nightly resolver to use ghc 9.10 (more work - I would prefer not doing that in this PR)
  • change repo settings not to expect stackage-nightly job as mandatory, but to expect stackage-lts23 (but I don't have permissions to fix repo settings)

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'll fix the repo settings

4 changes: 1 addition & 3 deletions cabal.project
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ packages:
./hls-test-utils


index-state: 2025-03-20T00:00:00Z
index-state: 2025-04-08T01:30:37Z

tests: True
test-show-details: direct
Expand Down Expand Up @@ -57,8 +57,6 @@ if impl(ghc >= 9.8.4) && impl(ghc < 9.8.5)
if impl(ghc >= 9.11)
benchmarks: False
allow-newer:
hiedb:base,
hiedb:ghc,
hie-bios:ghc,
ghc-trace-events:base,
tasty-hspec:base,
Expand Down
2 changes: 1 addition & 1 deletion ghcide/ghcide.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ library
, hashable
, hie-bios ^>=0.14.0
, hie-compat ^>=0.3.0.0
, hiedb ^>= 0.6.0.0
, hiedb ^>= 0.6.0.2
, hls-graph == 2.10.0.0
, hls-plugin-api == 2.10.0.0
, implicit-hie >= 0.1.4.0 && < 0.1.5
Expand Down
6 changes: 3 additions & 3 deletions haskell-language-server.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -407,7 +407,7 @@ library hls-call-hierarchy-plugin
, containers
, extra
, ghcide == 2.10.0.0
, hiedb ^>= 0.6.0.0
, hiedb ^>= 0.6.0.2
, hls-plugin-api == 2.10.0.0
, lens
, lsp >=2.7
Expand Down Expand Up @@ -594,7 +594,7 @@ library hls-rename-plugin
, containers
, ghcide == 2.10.0.0
, hashable
, hiedb ^>= 0.6.0.0
, hiedb ^>= 0.6.0.2
, hie-compat
, hls-plugin-api == 2.10.0.0
, haskell-language-server:hls-refactor-plugin
Expand Down Expand Up @@ -1596,7 +1596,7 @@ flag refactor
manual: True

common refactor
if flag(refactor)
if flag(refactor)
build-depends: haskell-language-server:hls-refactor-plugin
cpp-options: -Dhls_refactor

Expand Down
4 changes: 2 additions & 2 deletions stack-lts22.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
resolver: lts-22.25 # ghc-9.6.5
resolver: lts-22.43 # ghc-9.6.6

packages:
- .
Expand All @@ -19,7 +19,7 @@ allow-newer-deps:
extra-deps:
- Diff-0.5
- floskell-0.11.1
- hiedb-0.6.0.1
- hiedb-0.6.0.2
- hie-bios-0.14.0
- implicit-hie-0.1.4.0
- lsp-2.7.0.0
Expand Down
11 changes: 2 additions & 9 deletions stack.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
resolver: nightly-2024-06-12 # ghc-9.8.2
resolver: lts-23.18 # ghc-9.8.4

packages:
- .
Expand All @@ -20,15 +20,10 @@ allow-newer-deps:

extra-deps:
- floskell-0.11.1
- hiedb-0.6.0.1
- hie-bios-0.14.0
- hiedb-0.6.0.2
- implicit-hie-0.1.4.0
- hw-fingertree-0.1.2.1
- lsp-2.7.0.0
- lsp-test-0.17.1.0
- lsp-types-2.3.0.0
- monad-dijkstra-0.1.1.5
- stylish-haskell-0.14.6.0
- retrie-1.2.3

# stan dependencies not found in the stackage snapshot
Expand All @@ -38,8 +33,6 @@ extra-deps:
- trial-0.0.0.0
- trial-optparse-applicative-0.0.0.0
- trial-tomland-0.0.0.0
- cabal-add-0.1
- cabal-install-parsers-0.6.1.1

configure-options:
ghcide:
Expand Down
Loading