Skip to content

update Cabal-syntax bound to permit 3.16 #327

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.

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 1 commit into from
Jun 25, 2025

Conversation

geekosaur
Copy link
Contributor

We're preparing to release Cabal and Cabal-syntax 3.16. As per #309 we need hackage-security to be updated before we release.

Copy link
Member

@Mikolaj Mikolaj left a comment

Choose a reason for hiding this comment

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

It seems this doesn't require a new release, but just a revision, right? If so, I can revise.

@ulysses4ever
Copy link
Contributor

It seems so to me too. I think it's often the case.

@Mikolaj
Copy link
Member

Mikolaj commented Jun 24, 2025

If there are no objections by then, I will merge and revise tomorrow.

@andreasabel
Copy link
Member

Can we get some evidence this works with Cabal-3.16?
(The least would be someone stating here, "I tried it out successfully on my local machine".)

@Mikolaj
Copy link
Member

Mikolaj commented Jun 25, 2025

@geekosaur said on Matrix "building patched hackage-security locally (I did this last couple times)", but let us wait until @geekosaur confirms it was with cabal HEAD and all tests passed.

@geekosaur
Copy link
Contributor Author

I built it against cabal HEAD but didn't run tests. Is there an easy way to run tests locally, beyond just cabal test (I'm thinking CI tests)?

@geekosaur
Copy link
Contributor Author

Test suite TestSuite: RUNNING...
hackage-security
  InMem
    testInMemInitialHasForUpdates:   OK
    testInMemNoUpdates:              OK
    testInMemUpdatesAfterCron:       OK
    testInMemKeyRollover:            OK
    testInMemOutdatedTimestamp:      OK (0.02s)
    testInMemIndex:                  OK
  HttpMem
    testHttpMemInitialHasForUpdates: OK
    testHttpMemNoUpdates:            OK
    testHttpMemUpdatesAfterCron:     OK
    testHttpMemKeyRollover:          OK (0.01s)
    testHttpMemOutdatedTimestamp:    OK (0.02s)
    testHttpMemIndex:                OK
  Canonical JSON
    prop_roundtrip_canonical:        OK (0.05s)
      +++ OK, passed 100 tests.
    prop_roundtrip_pretty:           OK (0.16s)
      +++ OK, passed 100 tests.
    prop_canonical_pretty:           OK (0.17s)
      +++ OK, passed 100 tests.
    prop_aeson_canonical:            OK (0.03s)
      +++ OK, passed 100 tests.

All 16 tests passed (0.52s)
Test suite TestSuite: PASS

@geekosaur
Copy link
Contributor Author

I will note that, unless the test suite is cleverer than I think it is, this probably doesn't exercise anything being added in 3.16. But I'm not sure it's supposed to (e.g. what, if anything, does it do with SPDX?).

@Mikolaj
Copy link
Member

Mikolaj commented Jun 25, 2025

Yeah, that's mostly a smoke test, which is good enough.

I guess @andreasabel's request has been satisified and there are no other objections, so I'm going to merge and revise today, as advertised.

@Mikolaj Mikolaj merged commit 09104e0 into haskell:master Jun 25, 2025
36 checks passed
@Mikolaj
Copy link
Member

Mikolaj commented Jun 25, 2025

Doh, I didn't pay enough attention until I started revising on Hackage: shouldn't the second Cabal-syntax >= 3.7 && < 3.16 in hackage-security.cabal, the one for the test suite, be bumped as well? I assume so, so I've bumped it on Hackage, but we'd need to do so also in the repo:

Changes in this revision

    Changed the library component's library dependency on 'Cabal-syntax' from

    >=3.7 && <3.16

    to

    >=3.7 && <3.18

    Changed the test suite 'TestSuite' component's library dependency on 'Cabal' from

    >=3.7 && <3.16

    to

    >=3.7 && <3.18

    Changed the test suite 'TestSuite' component's library dependency on 'Cabal-syntax' from

    >=3.7 && <3.16

    to

    >=3.7 && <3.18

@Mikolaj
Copy link
Member

Mikolaj commented Jun 25, 2025

BTW, I revised only hackage-security, as always, because only this one is needed for a cabal release.

@geekosaur
Copy link
Contributor Author

#328

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants