Skip to content
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

Jump to bottom

Fix index-state syntax #4288

Merged
merged 4 commits into from
Feb 14, 2023
Merged

Fix index-state syntax #4288

merged 4 commits into from
Feb 14, 2023

Conversation

andreabedini
Copy link
Contributor

@andreabedini andreabedini commented Jan 19, 2023 •
edited by amesgen
Loading

Description

The second index-state stanza completely ovverides the first, resetting hackage index state to HEAD. See haskell/cabal#8568

Checklist

  • Branch
    • Commit sequence broadly makes sense
    • Commits have useful messages
    • The documentation has been properly updated
    • New tests are added if needed and existing tests are updated
    • If this branch changes Consensus and has any consequences for downstream repositories or end users, said changes must be documented in interface-CHANGELOG.md
    • If this branch changes Network and has any consequences for downstream repositories or end users, said changes must be documented in interface-CHANGELOG.md
    • If serialization changes, user-facing consequences (e.g. replay from genesis) are confirmed to be intentional.
  • Pull Request
    • Self-reviewed the diff
    • Useful pull request description at least containing the following information:
      • What does this PR change?
      • Why these changes were needed?
      • How does this affect downstream repositories and/or end-users?
      • Which ticket does this PR close (if any)? If it does, is it linked?
    • Reviewer requested

@andreabedini
Fix index-state syntax
d5b35db 
The second index-state stanza completely ovverides the first, resetting hackage index state to HEAD. See haskell/cabal#8568
amesgen
amesgen reviewed Jan 19, 2023
View reviewed changes
cabal.project Outdated Show resolved Hide resolved
amesgen
amesgen reviewed Jan 19, 2023
View reviewed changes
cabal.project Outdated
index-state: hackage.haskell.org 2022-12-01T00:00:00Z
index-state:
-- Bump this if you need newer packages from Hackage
, hackage.haskell.org 2022-12-01T00:00:00Z
Copy link
Member

Choose a reason for hiding this comment

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

Ah, Nix CI is failing due to our hackage.nix pin being too old, which was only possible to pass CI due to the bug you are fixing here. So bumping hackage.nix should get CI on green 👍

Copy link
Member

Choose a reason for hiding this comment

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

There are now CI failures due to the new HLS version, maybe revert hackage.nix index state back to the first of December to unblock this PR?

coot
coot approved these changes Jan 23, 2023
View reviewed changes
Copy link
Contributor

@coot coot left a comment

Choose a reason for hiding this comment

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

LGTM

@andreabedini andreabedini requested a review from a team as a code owner January 25, 2023 05:11
amesgen
amesgen approved these changes Jan 30, 2023
View reviewed changes
Copy link
Member

@amesgen amesgen left a comment

Choose a reason for hiding this comment

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

CI is green, let's get this bors'ed (maybe after squasing)

@andreabedini
Copy link
Contributor Author

bors try

iohk-bors bot added a commit that referenced this pull request Feb 10, 2023
@iohk-bors
Try #4288:
2788a58
@iohk-bors
Copy link
Contributor

iohk-bors bot commented Feb 10, 2023

try

Build failed:

@andreabedini
Copy link
Contributor Author

bors try

iohk-bors bot added a commit that referenced this pull request Feb 14, 2023
@iohk-bors
Try #4288:
e536427
@iohk-bors
Copy link
Contributor

iohk-bors bot commented Feb 14, 2023

try

Timed out.

@andreabedini
Copy link
Contributor Author

bors try

iohk-bors bot added a commit that referenced this pull request Feb 14, 2023
@iohk-bors
Try #4288:
f99fd6b
@iohk-bors
Copy link
Contributor

iohk-bors bot commented Feb 14, 2023

try

Timed out.

@amesgen
Copy link
Member

amesgen commented Feb 14, 2023

bors merge

iohk-bors bot added a commit that referenced this pull request Feb 14, 2023
@iohk-bors @andreabedini
Merge #4288
9cb9181 
4288: Fix index-state syntax r=amesgen a=andreabedini

# Description

The second index-state stanza completely ovverides the first, resetting hackage index state to HEAD. See haskell/cabal#8568



Co-authored-by: Andrea Bedini <[email protected]>
@amesgen
Copy link
Member

amesgen commented Feb 14, 2023

bors cancel

@iohk-bors
Copy link
Contributor

iohk-bors bot commented Feb 14, 2023

Canceled.

@amesgen
Copy link
Member

amesgen commented Feb 14, 2023

bors merge

iohk-bors bot added a commit that referenced this pull request Feb 14, 2023
@iohk-bors @andreabedini
Merge #4288
3b56dda 
4288: Fix index-state syntax r=amesgen a=andreabedini

# Description

The second index-state stanza completely ovverides the first, resetting hackage index state to HEAD. See haskell/cabal#8568



Co-authored-by: Andrea Bedini <[email protected]>
@iohk-bors
Copy link
Contributor

iohk-bors bot commented Feb 14, 2023

Build failed:

@amesgen
Copy link
Member

amesgen commented Feb 14, 2023

bors merge

@iohk-bors
Copy link
Contributor

iohk-bors bot commented Feb 14, 2023

Build succeeded:

@iohk-bors iohk-bors bot merged commit f20be6f into master Feb 14, 2023
@iohk-bors iohk-bors bot deleted the andreabedini-patch-1 branch February 14, 2023 19:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@amesgen amesgen amesgen approved these changes

@coot coot coot approved these changes

@bolt12 bolt12 Awaiting requested review from bolt12

@nfrisby nfrisby Awaiting requested review from nfrisby

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@andreabedini @amesgen @coot