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

warp-terminal: added passthru update script #292928

Merged
2 commits merged into from
Mar 3, 2024

Conversation

imadnyc
Copy link
Contributor

@imadnyc imadnyc commented Mar 3, 2024

Description of changes

Finally got around to adding a passthru update script. Here, I manually updated the macOS hash because to my understanding update-source-version expects a platform+architecture, but doesn't accept a general platform, which warp does with it's .dmg (again, to my understanding, I don't have a mac). I also wanted to add myself as a maintainer of this, but I already have that commit in #291443, and didn't want to duplicate the commit. If this is ready to be merged before that, though, I'll remove that one and add it here.

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.

@imadnyc imadnyc force-pushed the warp-terminal-initial-linux branch 2 times, most recently from d3d05f3 to a6a310f Compare March 3, 2024 01:56
@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/does-update-source-version-have-a-generic-system-flag/40679/1

@imadnyc imadnyc force-pushed the warp-terminal-initial-linux branch 2 times, most recently from dfac750 to 5234ea1 Compare March 3, 2024 05:35
Copy link

@ghost ghost left a comment

Choose a reason for hiding this comment

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

change looks good. minor comments inline.
do you want to add yourself to the maintainers?

pkgs/by-name/wa/warp-terminal/update.sh Outdated Show resolved Hide resolved
@imadnyc
Copy link
Contributor Author

imadnyc commented Mar 3, 2024

Yeah, I'd like to be a maintainer if my other PRS aren't going to be merged before this. I'll update the other ones if this gets merged.

@ghost
Copy link

ghost commented Mar 3, 2024

Yeah, I'd like to be a maintainer if my other PRS aren't going to be merged before this. I'll update the other ones if this gets merged.

add the maintainer commit to this PR as this PR is close to getting merged.

you need to fix your other commit message though. the body is not adding anything useful to someone who will be looking at the commit logs sometime in the future.

look at the output from git log for some examples.

@ghost ghost requested review from Enzime and emilytrau March 3, 2024 08:53
@imadnyc imadnyc force-pushed the warp-terminal-initial-linux branch 2 times, most recently from 23e3554 to df6d07f Compare March 3, 2024 21:08
@imadnyc
Copy link
Contributor Author

imadnyc commented Mar 3, 2024

I've added myself to the maintainer list and removed my commit body - I was squashing instead of amending and forgot to remove the commit messages getting added to the body.

@imadnyc imadnyc force-pushed the warp-terminal-initial-linux branch from df6d07f to bbd653d Compare March 3, 2024 21:10
@ghost
Copy link

ghost commented Mar 3, 2024

there are some somewhat strict rules about commit messages. the commits need to be:
maintainers: add imadnyc
warp-terminal: added passthru update script

the maintainers needs to come first, otherwise if someone is performing a bisect the eval will break if they land on the warp-terminal change because you are missing from the maintainers file. you'll need to do something like git rebase -i HEAD~2 reorder the commits and rewrite the maintainer message.

@imadnyc imadnyc force-pushed the warp-terminal-initial-linux branch from bbd653d to aa9b78d Compare March 3, 2024 21:31
@imadnyc
Copy link
Contributor Author

imadnyc commented Mar 3, 2024

I'm gonna pretend it was because I didn't drink coffee today and nothing else. I think it should be good for real this time

Copy link

@ghost ghost left a comment

Choose a reason for hiding this comment

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

LGTM. validated curl -s https://api.github.com/users/imadnyc|jq '{name,github:.login,githubId:.id}' matches github info in maintainers

@ghost ghost merged commit 34de1a9 into NixOS:master Mar 3, 2024
22 of 24 checks passed
version=$(get_version "${url}")
if [[ ${version} != "$(json_get ".${sys}.version")" ]];
then
sri=$(nix hash to-sri --type sha256 "$(nix-prefetch-url --type sha256 "${url}")")
Copy link

Choose a reason for hiding this comment

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

haven't seen an update posted yet. this might need to be nix-hash --to-sri as nix hash is experimental and can generate an error if the magic config settings are not set.

Copy link

@ghost ghost Mar 7, 2024

Choose a reason for hiding this comment

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

or not -- i see nix hash in some other update.sh. pkgs/tools/video/recyclarr/update.sh and looks like it had an auto-update. #267039

and the update script has not run yet on warp-terminal. https://r.ryantm.com/log/warp-terminal/

This pull request was closed.
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.

3 participants