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

[Backport release-23.11] warp-terminal: 0.2024.03.26.08.02.stable_02 -> 0.2024.04.02.08.02.stable_01 #302933

Merged

Conversation

DontEatOreo
Copy link
Member

Description of changes

Changelog: https://docs.warp.dev/getting-started/changelog#id-2024.04.04-v0.2024.04.02.08.02

Manually backport and resolved merge conflicts for #302079

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.05 Release Notes (or backporting 23.05 and 23.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@risicle
Copy link
Contributor

risicle commented Apr 9, 2024

The commits you've referenced in the cherry-picks didn't end up in either master or staging - might it have been rebase-merged?

@DontEatOreo DontEatOreo force-pushed the backport-302079-to-release-23.11 branch from 34e1558 to 486ff4f Compare April 9, 2024 21:18
@LeSuisse
Copy link
Contributor

LeSuisse commented Apr 9, 2024

Source PR seems to have been squash merged but there is a patch from a previous PR that is missing, the expected commits seem to be 4844f7d 7872e50

@DontEatOreo DontEatOreo force-pushed the backport-302079-to-release-23.11 branch 2 times, most recently from ffc91d5 to 92d60b1 Compare April 9, 2024 21:33
@DontEatOreo
Copy link
Member Author

DontEatOreo commented Apr 9, 2024

Source PR seems to have been squash merged but there is a patch from a previous PR that is missing, the expected commits seem to be 4844f7d 7872e50

Hey, uhh how I'm suppose to cherry pick this? Isn't it git cherry-pick -x 7872e50e11b94fc42c14dae8fb22f9ea16a63921?

@risicle
Copy link
Contributor

risicle commented Apr 9, 2024

Cherry-pick them one after the other, as separate commits.

@LeSuisse
Copy link
Contributor

LeSuisse commented Apr 9, 2024

The automated backport failed in #302079 because #300326 was not backported so something like git cherry-pick -x 4844f7dad30a6b8f7aa39ab709c306e5b5fe0945 7872e50e11b94fc42c14dae8fb22f9ea16a63921 should do the trick

r-ryantm and others added 2 commits April 10, 2024 00:45
…ble_01 (NixOS#302079)

* warp-terminal: 0.2024.03.26.08.02.stable_02 -> 0.2024.04.02.08.02.stable_01

Changelog: https://docs.warp.dev/getting-started/changelog#id-2024.04.04-v0.2024.04.02.08.02

* warp-terminal: 0.2024.03.26.08.02.stable_02 -> 0.2024.04.02.08.02.stable_01

Changelog: https://docs.warp.dev/getting-started/changelog#id-2024.04.04-v0.2024.04.02.08.02
(cherry picked from commit 7872e50)
@DontEatOreo DontEatOreo force-pushed the backport-302079-to-release-23.11 branch from 92d60b1 to 67bfec8 Compare April 9, 2024 21:46
@DontEatOreo DontEatOreo requested a review from wegank April 10, 2024 10:41
@wegank wegank merged commit 4e26a92 into NixOS:release-23.11 Apr 11, 2024
25 of 26 checks passed
@DontEatOreo DontEatOreo deleted the backport-302079-to-release-23.11 branch May 3, 2024 10:08
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants