Skip to content

haiku: add as known platform #9006

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
Merged
merged 1 commit into from
Jun 14, 2023
Merged

haiku: add as known platform #9006

merged 1 commit into from
Jun 14, 2023

Conversation

jessicah
Copy link
Contributor

@jessicah jessicah commented Jun 7, 2023 •
edited
Loading

Please include the following checklist in your PR:

Bonus points for added automated tests!

@jessicah jessicah force-pushed the haiku-as-platform branch from 20f3825 to fbb5136 Compare June 7, 2023 11:04
@jessicah jessicah mentioned this pull request Jun 7, 2023
Closed
@fgaz
Copy link
Member

fgaz commented Jun 9, 2023

The failure is expected, that test is supposed to fail with this kind of patch. To fix it you have to update the mismatched hash

@jessicah jessicah force-pushed the haiku-as-platform branch from fbb5136 to e76f54f Compare June 9, 2023 08:44
@jessicah
Copy link
Contributor Author

jessicah commented Jun 9, 2023

@fgaz ah thanks, have updated my commit to include the hash change, just couldn't find any documentation/comments on what it was, or how it should be generated to compare against.

@jessicah jessicah mentioned this pull request Jun 9, 2023
Closed
2 tasks
@fgaz
Copy link
Member

fgaz commented Jun 9, 2023

@Kleidukos this is a breaking change, we can't backport

@Kleidukos
Copy link
Member

Ah, I had not realised.

@andreabedini
Copy link
Collaborator

@fgaz thanks for pointing this out. I was confused myself and had to double-check: adding entities is not a breaking change but changing data types (even by simply adding a constructor) is.

@jessicah jessicah force-pushed the haiku-as-platform branch from e76f54f to 1c8afa1 Compare June 10, 2023 22:56
@jessicah
Copy link
Contributor Author

Oops, I didn't see the merge conflict, updated :)

@jessicah jessicah force-pushed the haiku-as-platform branch from 22d9d8f to b57559e Compare June 11, 2023 22:37
@jessicah
Copy link
Contributor Author

@fgaz looks good to merge? :)

andreabedini
andreabedini approved these changes Jun 12, 2023
View reviewed changes
Copy link
Collaborator

@andreabedini andreabedini left a comment

Choose a reason for hiding this comment

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

👍

geekosaur
geekosaur approved these changes Jun 12, 2023
View reviewed changes
Copy link
Collaborator

@geekosaur geekosaur left a comment

Choose a reason for hiding this comment

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

Looks good to me

@andreabedini andreabedini added merge me Tell Mergify Bot to merge and removed attention: needs-review labels Jun 12, 2023
@ulysses4ever ulysses4ever added squash+merge me Tell Mergify Bot to squash-merge and removed merge me Tell Mergify Bot to merge labels Jun 12, 2023
@ulysses4ever
Copy link
Collaborator

@andreabedini i changed the label to squash instead of just merge, as the second commit doesn't make sense separately.

@andreabedini
Copy link
Collaborator

Thank you @ulysses4ever

@mergify mergify bot added the merge delay passed Applied (usually by Mergify) when PR approved and received no updates for 2 days label Jun 14, 2023
@jessicah
Copy link
Contributor Author

Says it failed, but I can't see any actual failure?

@ulysses4ever
Copy link
Collaborator

@mergify rebase

@mergify
Copy link
Contributor

mergify bot commented Jun 14, 2023

rebase

✅ Branch has been successfully rebased

@ulysses4ever
Copy link
Collaborator

@jessicah let me try to rebase and restart...

@jessicah jessicah force-pushed the haiku-as-platform branch from 315b080 to 07c6873 Compare June 14, 2023 20:57
@jessicah
Copy link
Contributor Author

Rebased and squashed the change log commit, hopefully it passes again now...

@mergify mergify bot merged commit 1df4a48 into haskell:master Jun 14, 2023
@jessicah
Copy link
Contributor Author

Do you know approximately when 3.12 will be released? Projects run cabal check in CI, blocking upstreaming of all my other PRs, and also needing to get into hackage-server as well?

@jessicah jessicah deleted the haiku-as-platform branch June 16, 2023 07:12
@jessicah
Copy link
Contributor Author

@fgaz would it be possible to backport to 3.10/3.11 by using OtherOS "haiku"? It looks like it wouldn't be too hard to make the change work, just an extra check in Check.hs to not fail on OtherOS "haiku" for the unknownOSs list comprehension. Making hackage work would be extremely simple too... map OtherOS "haiku" to the same constant as OS::Haiku when can use Cabal 3.12. None of my other PRs currently seem to depend on OSHaiku as a value, just that os(haiku) currently isn't recognised in .cabal files.

jessicah added a commit to jessicah/hs-cabal that referenced this pull request Jun 20, 2023
@jessicah
check: allow "haiku" as a valid OS string.
ebf8be8 
The `OSHaiku` identifier has been merged in haskell#9006, for a future
3.13 release. However, tools that rely on earlier versions of
cabal -- such as hackage -- don't recognise "haiku" as a valid OS
identifier.

This allows packages with `os(haiku)` present to pass CI and be
uploaded to hackage in the interim.
@jessicah jessicah mentioned this pull request Jun 20, 2023
Merged
4 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@andreabedini andreabedini andreabedini approved these changes

@geekosaur geekosaur geekosaur approved these changes

Assignees
No one assigned
Labels
merge delay passed Applied (usually by Mergify) when PR approved and received no updates for 2 days squash+merge me Tell Mergify Bot to squash-merge
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@jessicah @fgaz @Kleidukos @andreabedini @ulysses4ever @geekosaur