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.

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

gitbutler: 0.12.16 -> 0.13.17 #355366

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

gitbutler: 0.12.16 -> 0.13.17 #355366

wants to merge 2 commits into from
+78 −8,548

Conversation

getchoo
Copy link
Member

@getchoo getchoo commented Nov 12, 2024 •
edited
Loading

Closes #335875
Fixes #355157
Supersedes #347819
Part of #354146

Changelog: https://github.com/gitbutlerapp/gitbutler/releases/tag/release%2F0.13.17
Diff: gitbutlerapp/gitbutler@release/0.12.16...release/0.13.17

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.11 Release Notes (or backporting 23.11 and 24.05 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.

@ofborg ofborg bot requested a review from techknowlogick November 12, 2024 18:39
@techknowlogick
Copy link
Member

Thanks for figuring this one out <3

Will run this through nixpkgs-review and test it out soon.

@techknowlogick
Copy link
Member

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 355366

aarch64-darwin

❌ 1 package failed to build:
  • gitbutler

@techknowlogick
Copy link
Member 

       >   = note: ld: warning: directory not found for option '-L/private/tmp/nix-build-gitbutler-0.13.13.drv-0/source/target/aarch64-apple-darwin/release/build/libz-ng-sys-bff808f92c624259/out/lib64'
       >           ld: library not found for -lcurl
       >           clang-16: error: linker command failed with exit code 1 (use -v to see invocation)
       >
       >
       > error: could not compile `gitbutler-tauri` (lib) due to 1 previous error

@getchoo
Copy link
Member Author

getchoo commented Nov 12, 2024

Thanks for catching that. My old MBA takes ages to build this 😆

@sarahec sarahec added the 0.kind: ZHF Fixes Fixes during the Zero Hydra Failures (ZHF) campaign label Nov 13, 2024
@sarahec
Copy link
Contributor

sarahec commented Nov 13, 2024

Result of nixpkgs-review pr 355366 run on aarch64-darwin 1

1 package failed to build:
  • gitbutler

@sarahec
Copy link
Contributor

sarahec commented Nov 13, 2024

Build error (aarch64-darwin):

       > Finished cargoCheckHook
       > checkPhase completed in 1 minutes 45 seconds
       > Running phase: glibPreInstallPhase
       > Running phase: glibPreInstallPhase
       > Running phase: installPhase
       > Executing tauriInstallHook
       > mv: cannot stat '/nix/store/4wxc38ls8z07gfrmiqq9zw81zplk740g-gitbutler-0.13.13/Applications/GitButler.app/Contents/MacOS/GitButler': No such file or directory

@getchoo
Copy link
Member Author

getchoo commented Nov 13, 2024

Ah, binary name must have changed there too. Thanks so much :)

@sarahec
Copy link
Contributor

sarahec commented Nov 13, 2024

Result of nixpkgs-review pr 355366 run on aarch64-darwin 1

1 package built:
  • gitbutler

@techknowlogick
Copy link
Member

Thanks for catching that. My old MBA takes ages to build this 😆

No worries, a bit of warmth in these colder months 😆

Sorry for just pasting the build error above without any context; I had to rush off and couldn't provide more details, but I figured what I had would be enough, and if not, then at least it'd be a starting point until I could get back and give more.

Thanks again for figuring out what was going on with the rust stuff. And thank you, @sarahec, for providing additional Darwin build information.

@techknowlogick techknowlogick added 12.approvals: 1 This PR was reviewed and approved by one reputable person 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in the package labels Nov 13, 2024
@getchoo
Copy link
Member Author

getchoo commented Nov 13, 2024

Result of nixpkgs-review pr 355366 run on aarch64-linux 1

1 package built:
  • gitbutler

@ofborg ofborg bot requested a review from techknowlogick November 13, 2024 14:27
@Scrumplex Scrumplex mentioned this pull request Nov 14, 2024
Merged
13 tasks
@getchoo getchoo removed 12.approvals: 1 This PR was reviewed and approved by one reputable person 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in the package labels Nov 15, 2024
@getchoo
Copy link
Member Author

getchoo commented Nov 15, 2024 •
edited
Loading

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 355366

x86_64-linux

✅ 1 package built:
  • gitbutler

x86_64-darwin

✅ 1 package built:
  • gitbutler

aarch64-darwin

✅ 1 package built:
  • gitbutler

aarch64-linux

✅ 1 package built:
  • gitbutler

@getchoo getchoo added the backport release-24.11 Backport PR automatically label Nov 16, 2024
Scrumplex
Scrumplex reviewed Nov 19, 2024
View reviewed changes
Copy link
Member

@Scrumplex Scrumplex left a comment •
edited
Loading

Choose a reason for hiding this comment

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

0.13.15 has been released, and I was reminded and offered to update using upstream's updater. Interestingly, it fails with Invalid cross-device link (os error 18)

Is your patch supposed to disable the updater too?

@getchoo
Copy link
Member Author

getchoo commented Nov 21, 2024

Is your patch supposed to disable the update too?

.bundle.createUpdaterArtifacts = false on this line should. Guess this is another weird thing from Tauri v2 :/

@pbsbot
Copy link

pbsbot commented Nov 24, 2024

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 355366

x86_64-linux

⏩ 1 package marked as broken and skipped:
  • gitbutler

@getchoo
Copy link
Member Author

getchoo commented Nov 26, 2024

Bumped to the latest version, and the updater should be removed properly now

@getchoo getchoo changed the title gitbutler: 0.12.16 -> 0.13.13 gitbutler: 0.12.16 -> 0.13.17 Nov 26, 2024
@getchoo
Copy link
Member Author

getchoo commented Nov 26, 2024

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 355366

aarch64-linux

✅ 1 package built:
  • gitbutler

@phsb5321
Copy link

Is there any reason it's not merged yet?

@getchoo
Copy link
Member Author

getchoo commented Nov 28, 2024

Waiting on reviews now

@nixos-discourse
Copy link

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

https://discourse.nixos.org/t/prs-ready-for-review/3032/4891

Scrumplex
Scrumplex reviewed Nov 28, 2024
View reviewed changes
Copy link
Member

@Scrumplex Scrumplex left a comment

Choose a reason for hiding this comment

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

changes LGTM. Currently building

@Scrumplex
Copy link
Member

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 355366

x86_64-linux

✅ 1 package built:
  • gitbutler

x86_64-darwin

✅ 1 package built:
  • gitbutler

aarch64-darwin

✅ 1 package built:
  • gitbutler

@Scrumplex
Copy link
Member

It seems like after trying to run the main program, it fails with the following error:

thread 'main' panicked at crates/gitbutler-tauri/src/main.rs:262:18:
Failed to build tauri app: PluginInitialization("updater", "Error deserializing 'plugins.updater' within your Tauri configuration: invalid type: null, expected struct Config")

I guess removing the updater configuration breaks parsing it at runtime :/

@Scrumplex Scrumplex self-requested a review November 28, 2024 20:41
@wegank wegank added 12.approvals: 2 This PR was reviewed and approved by two reputable people 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in the package labels Nov 29, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@techknowlogick techknowlogick Awaiting requested review from techknowlogick

@Scrumplex Scrumplex Awaiting requested review from Scrumplex

Assignees
No one assigned
Labels
0.kind: ZHF Fixes Fixes during the Zero Hydra Failures (ZHF) campaign 10.rebuild-darwin: 1-10 10.rebuild-darwin: 1 10.rebuild-linux: 1-10 10.rebuild-linux: 1 11.by: package-maintainer This PR was created by the maintainer of the package it changes 12.approvals: 2 This PR was reviewed and approved by two reputable people 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in the package backport release-24.11 Backport PR automatically
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Build failure: gitbutler Update request: gitbutler 0.12.16 → 0.12.20
8 participants
@getchoo @techknowlogick @sarahec @pbsbot @phsb5321 @nixos-discourse @Scrumplex @wegank