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.

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

Bump time upper bound to acccomodate 1.14 (backport #9848) #9869

Merged
merged 1 commit into from
Apr 6, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Apr 6, 2024

Just as it says on the tin.


This is an automatic backport of pull request #9848 done by Mergify.

@Mikolaj Mikolaj requested review from bgamari and ffaf1 April 6, 2024 10:59
@mergify mergify bot added the backport label Apr 6, 2024
@Mikolaj
Copy link
Member

Mikolaj commented Apr 6, 2024

@ffaf1: I think @bgamari needs that in GHC 9.10 or maybe even has this as a private patch in GHC 9.10 already.

If I'm wrong and it's not needed, does it complicate our 3.12.0.0 release in any way? If not, we might as well merge it and then also #9851, I guess?

Copy link
Collaborator

@ffaf1 ffaf1 left a comment

Choose a reason for hiding this comment

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

Sure, let's see what Ben has to say.

@bgamari
Copy link
Contributor

bgamari commented Apr 6, 2024

Indeed this is necessary for us to bump the time library in GHC 9.10.1. See https://gitlab.haskell.org/ghc/ghc/-/issues/24528

@ffaf1 ffaf1 added merge me Tell Mergify Bot to merge backport and removed backport labels Apr 6, 2024
@Mikolaj
Copy link
Member

Mikolaj commented Apr 6, 2024

This is a strange CI failure. I filed it at https://docs.google.com/spreadsheets/d/1BnSfXOs5fNsJO3ovoTJANwH03wHucv0X7Pn8t-z_P5E/edit#gid=891834841. Restart fixed it, but now it fails elsewhere.

@Mikolaj
Copy link
Member

Mikolaj commented Apr 6, 2024

Oh, I see, we first need to backport @andreasabel's quickfix for node20: #9859

@Mikolaj
Copy link
Member

Mikolaj commented Apr 6, 2024

@mergify rebase

Copy link
Contributor Author

mergify bot commented Apr 6, 2024

rebase

✅ Branch has been successfully rebased

@Mikolaj Mikolaj force-pushed the mergify/bp/3.12/pr-9848 branch from 554a497 to f2b9475 Compare April 6, 2024 16:50
@Mikolaj
Copy link
Member

Mikolaj commented Apr 6, 2024

CI failed (a fluke, I think) in https://github.com/haskell/cabal/actions/runs/8582534804/job/23520759688?pr=9869 with

+ /usr/local/bin/python3 -m http.server -d /var/folders/24/8k48jl6d249_n_qfxwsl6xvm0000gn/T/cabal-testsuite-10202/cabal.dist/repo --bind localhost 8000
[retry:0] Encountered Network.Socket.connect: <socket: 13>: does not exist (Connection refused). Retrying.
[retry:1] Encountered Network.Socket.connect: <socket: 13>: does not exist (Connection refused). Retrying.
[retry:2] Encountered Network.Socket.connect: <socket: 13>: does not exist (Connection refused). Retrying.
[retry:3] Encountered Network.Socket.connect: <socket: 13>: does not exist (Connection refused). Retrying.
[retry:4] Encountered Network.Socket.connect: <socket: 13>: does not exist (Connection refused). Retrying.
[retry:5] Encountered Network.Socket.connect: <socket: 13>: does not exist (Connection refused). Retrying.
[retry:6] Encountered Network.Socket.connect: <socket: 13>: does not exist (Connection refused). Retrying.
Traceback (most recent call last):
  File "<frozen runpy>", line 198, in _run_module_as_main
  File "<frozen runpy>", line 88, in _run_code
  File "/Library/Frameworks/Python.framework/Versions/3.12/lib/python3.12/http/server.py", line 1314, in <module>
    test(
  File "/Library/Frameworks/Python.framework/Versions/3.12/lib/python3.12/http/server.py", line 1261, in test
    with ServerClass(addr, HandlerClass) as httpd:
         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
  File "/Library/Frameworks/Python.framework/Versions/3.12/lib/python3.12/socketserver.py", line 457, in __init__
    self.server_bind()
  File "/Library/Frameworks/Python.framework/Versions/3.12/lib/python3.12/http/server.py", line 1308, in server_bind
    return super().server_bind()
           ^^^^^^^^^^^^^^^^^^^^^
  File "/Library/Frameworks/Python.framework/Versions/3.12/lib/python3.12/http/server.py", line 136, in server_bind
    socketserver.TCPServer.server_bind(self)
  File "/Library/Frameworks/Python.framework/Versions/3.12/lib/python3.12/socketserver.py", line 473, in server_bind
    self.socket.bind(self.server_address)
OSError: [Errno 48] Address already in use
[retry:7] Encountered Network.Socket.connect: <socket: 12>: does not exist (Connection refused). Retrying.
[retry:8] Encountered Network.Socket.connect: <socket: 12>: does not exist (Connection refused). Retrying.
[retry:9] Encountered Network.Socket.connect: <socket: 12>: does not exist (Connection refused). Retrying.
[retry:10] Encountered Network.Socket.connect: <socket: 12>: does not exist (Connection refused). Retrying.

stderr:
*** Exception: Network.Socket.connect: <socket: 12>: does not exist (Connection refused)

Restarting...

@geekosaur
Copy link
Collaborator

Sigh, wish #9540 hadn't stalled due to some Windows thing IIRC.

@mergify mergify bot merged commit 8728fc4 into 3.12 Apr 6, 2024
55 checks passed
@mergify mergify bot deleted the mergify/bp/3.12/pr-9848 branch April 6, 2024 20:27
@mergify mergify bot added the merge delay passed Applied (usually by Mergify) when PR approved and received no updates for 2 days label Apr 8, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport merge delay passed Applied (usually by Mergify) when PR approved and received no updates for 2 days merge me Tell Mergify Bot to merge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants