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

wezterm: Update to sha 30345b36d8a00fed347e4df5dadd83915a7693fb #26026

Open
wants to merge 1 commit into
base: master
Choose a base branch
from

Conversation

eschnett
Copy link
Contributor

Description

Update wezterm to a newer (not yet released) upstream version. Closes https://trac.macports.org/ticket/70833 .

Type(s)
  • bugfix
  • enhancement
  • security fix
Tested on

macOS 15.0 24A335 arm64
Xcode 16.0 16A242d

Verification

Have you

  • followed our Commit Message Guidelines?
  • squashed and minimized your commits?
  • checked that there aren't other open pull requests for the same change?
  • referenced existing tickets on Trac with full URL in commit message?
  • checked your Portfile with port lint --nitpick?
  • tried existing tests with sudo port test?
  • tried a full install with sudo port -vst install?
  • tested basic functionality of all binary files?
  • checked that the Portfile's most important variants haven't been broken?

sudo port test fails with a message that I do not understand. The error is

:info:build error: could not load Cargo configuration
:info:build Caused by:
:info:build   could not parse TOML configuration in `/opt/local/var/macports/build/_Users_eschnett_src_macports-ports_aqua_wezterm/wezterm/work/.home/.cargo/config.toml`
:info:build Caused by:
:info:build   TOML parse error at line 14, column 1
:info:build      |
:info:build   14 | [build]
:info:build      | ^
:info:build   invalid table header
:info:build   duplicate key `build` in document root

@macportsbot
Copy link

Notifying maintainers:
@herbygillot for port wezterm.

@eschnett eschnett marked this pull request as ready for review September 30, 2024 14:49
@markemer
Copy link
Member

markemer commented Oct 1, 2024

This sha I picked was the HEAD at a random time. We should pick at the current head as of some date, like today, or the first SHA after the last release that works on sequoia. I like the idea of using the current head with a comment saying to update it when the release happens.

The current head would be wez/wezterm@a2f2c07

@reneeotten
Copy link
Contributor

This sha I picked was the HEAD at a random time. We should pick at the current head as of some date, like today, or the first SHA after the last release that works on sequoia. I like the idea of using the current head with a comment saying to update it when the release happens.

The current head would be wez/wezterm@a2f2c07

well... typically a port should install an version released by upstream, not some random git commit hash. If earlier releases don't work on the latest macOS version it might be time to try and persuade upstream to tag a nee version.

If you want to follow upstream development that should be done in a "-devel" subport.

Let's leave a decision in this to the port maintainer @herbygillot

@markemer
Copy link
Member

markemer commented Oct 2, 2024

This sha I picked was the HEAD at a random time. We should pick at the current head as of some date, like today, or the first SHA after the last release that works on sequoia. I like the idea of using the current head with a comment saying to update it when the release happens.
The current head would be wez/wezterm@a2f2c07

well... typically a port should install an version released by upstream, not some random git commit hash. If earlier releases don't work on the latest macOS version it might be time to try and persuade upstream to tag a nee version.

If you want to follow upstream development that should be done in a "-devel" subport.

Let's leave a decision in this to the port maintainer @herbygillot

Yeah - I have a git stash just to bring in a SHA that works, but a -devel might not be a bad idea. I can open an issue upstream about not building on 15, sadly since the binary release works and HEAD works, I anticipate some push back, but can't hurt to try.

@@ -4,7 +4,7 @@ PortSystem 1.0
PortGroup cargo 1.0
PortGroup github 1.0

github.setup wez wezterm 20240203-110809-5046fc22
github.setup wez wezterm 30345b36d8a00fed347e4df5dadd83915a7693fb
Copy link
Member

@herbygillot herbygillot Oct 3, 2024

Choose a reason for hiding this comment

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

The only issue here is that the SHA version doesn't follow the same format as the version there currently.
So maybe we can do this, but explicitly set a datestamped current version with the assumption that the next release will have a higher (later) datestamp.

So perhaps something like this:

github.setup        wez wezterm 30345b36d8a00fed347e4df5dadd83915a7693fb
version             20240813-000000-30345b36d8

20240813 is the datestamp of that commit.

Copy link
Member

Choose a reason for hiding this comment

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

Not a bad plan. We should decide if this is the SHA we want, too. I want to stress that this was just HEAD at the time I tested to see if it had been fixed upstream, and I've just run with it so far.

@reneeotten
Copy link
Contributor

@herbygillot can you please take over this PR and get it merged? It's not going anywhere - otherwise I'll close it.

@herbygillot
Copy link
Member

@herbygillot can you please take over this PR and get it merged? It's not going anywhere - otherwise I'll close it.

Will do

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

Successfully merging this pull request may close these issues.

5 participants