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

git-branchless: 0.9.0 -> 0.10.0 & fix build #342278

Merged
merged 3 commits into from
Oct 21, 2024
Merged

git-branchless: 0.9.0 -> 0.10.0 & fix build #342278

merged 3 commits into from
Oct 21, 2024

Conversation

bryango
Copy link
Member

@bryango bryango commented Sep 16, 2024 •
edited
Loading

Description of changes

P.S. a log cache of the current upstream CI test failures can be found here: git-branchless-job-logs.txt

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 review from nh2 and hmenke September 16, 2024 14:11
@bryango bryango force-pushed the git-branchless-fix-build branch 3 times, most recently from 574bfdd to ee3352f Compare September 17, 2024 16:02
@ofborg ofborg bot requested a review from hmenke September 17, 2024 16:59
@bryango
Copy link
Member Author

bryango commented Sep 18, 2024 •
edited
Loading

It seems that most of the test skips in #339023 are actually necessary as they are also failing on the upstream master; see e.g. a log cache of the current upstream CI test failures: git-branchless-job-logs.txt. Fortunately, most of them seem to be harmless.

I have added some comments in checkFlags to explain the nature of these failures.

@bryango bryango marked this pull request as ready for review September 18, 2024 20:56
@bryango
Copy link
Member Author

bryango commented Oct 2, 2024 •
edited
Loading

Friendly ping @nh2 @hmenke for comments and (re-)review 👋 I have been running on this for a few weeks now, nothing out of the ordinary for me (I am a lightweight user though).

A CI re-run against a recent master (de7b63a011eb3e226d2f38c21789c1443d7d8983) can be found here: https://github.com/bryango/nix-build-action/actions/runs/11136859471

This was referenced Oct 2, 2024
Merged
Closed
@xanderio
Copy link
Contributor

xanderio commented Oct 8, 2024

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

1 package built:
  • git-branchless

@xanderio xanderio added the 12.approvals: 1 This PR was reviewed and approved by one reputable person label Oct 8, 2024
@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 and removed 12.approvals: 1 This PR was reviewed and approved by one reputable person labels Oct 9, 2024
@bryango
git-branchless: improve for cross compiling
8d26e1d 
In a previous commit d5a849c,
the `postInstall` hook invokes the host binary `git-branchless`, which
would probably fail when cross compiling. In this commit, we simply
disable the hook in these cases.

Also, add myself to meta.maintainers.
@bryango
Copy link
Member Author

bryango commented Oct 12, 2024

Also, upstream simply disabled the test suite for git>=2.46, see:

@niklaskorz
Copy link
Contributor

0.10.0 was just released, so we don't need to cherry-pick fixes anymore: https://github.com/arxanas/git-branchless/releases/tag/v0.10.0

@bryango bryango changed the title git-branchless: fix build again git-branchless: 0.9.0 -> 0.10.0 & fix build Oct 15, 2024
@bryango
Copy link
Member Author

bryango commented Oct 15, 2024 •
edited
Loading

Bumped for 0.10.0, waiting for ofborg...

hmenke
hmenke approved these changes Oct 15, 2024
View reviewed changes
Copy link
Member

@hmenke hmenke left a comment

Choose a reason for hiding this comment

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

It's really unfortunate that so many tests fail. Maybe it might even be better to just doCheck = false;

@bryango
git-branchless: disable tests for now
8d7be6e 
The previous commit is kept as a record of the currently failing tests,
for future reference.
@bryango
Copy link
Member Author

bryango commented Oct 15, 2024

Indeed haha... I pushed a new commit with doCheck = false. The previous commit is kept such that we have a record of the currently failing test in the git history.

@ofborg ofborg bot requested a review from hmenke October 15, 2024 16:15
@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-already-reviewed/2617/2040

@bryango
Copy link
Member Author

bryango commented Oct 21, 2024

Friendly ping @Artturin and @eclairevoyant for merging 👀 Approved by @hmenke among others.

@eclairevoyant
Copy link
Contributor

FYI I don't participate in nixpkgs PRs anymore nor am I currently a committer.

@bryango
Copy link
Member Author

bryango commented Oct 21, 2024

FYI I don't participate in nixpkgs PRs anymore nor am I currently a committer.

I see, sorry for the noise, and thank you so much for your contributions for all these years!

@Scrumplex
Copy link
Member

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 342278

x86_64-linux

✅ 1 package built:
  • git-branchless

@Scrumplex Scrumplex merged commit 47626c9 into NixOS:master Oct 21, 2024
28 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Scrumplex Scrumplex Scrumplex approved these changes

@xanderio xanderio xanderio approved these changes

@bb010g bb010g bb010g approved these changes

@nh2 nh2 Awaiting requested review from nh2

@hmenke hmenke Awaiting requested review from hmenke

Assignees
No one assigned
Labels
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
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Build failure: git-branchless
9 participants
@bryango @xanderio @niklaskorz @nixos-discourse @eclairevoyant @Scrumplex @bb010g @hmenke @wegank