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

mesa: 22.1.4 -> 22.1.5 #185699

Closed
wants to merge 1 commit into from
Closed

mesa: 22.1.4 -> 22.1.5 #185699

wants to merge 1 commit into from

Conversation

PedroHLC
Copy link
Member

@PedroHLC PedroHLC commented Aug 8, 2022

Description of changes
  1. Bump changes: https://docs.mesa3d.org/relnotes/22.1.5.html

  2. Moved patches (that were already using SRI hashes), I've adopted what the wiki calls the preferred way.

  3. Added the fix for https://gitlab.freedesktop.org/mesa/mesa/-/issues/6519 as a patch (for darwin only).

Things done
  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandbox = true set in nix.conf? (See Nix manual)
  • 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/)
  • 22.11 Release Notes (or backporting 22.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
    • (Release notes changes) Ran nixos/doc/manual/md-to-db.sh to update generated release notes
  • Fits CONTRIBUTING.md.

@ofborg ofborg bot added the 6.topic: darwin Running or building packages on Darwin label Aug 8, 2022
@PedroHLC PedroHLC requested review from vcunat and primeos August 8, 2022 19:20
@PedroHLC PedroHLC marked this pull request as ready for review August 8, 2022 19:24
@vcunat
Copy link
Member

vcunat commented Aug 8, 2022

Are you sure that the darwin fixes have been included in 22.1.5? I haven't noticed them in the release notes.

@PedroHLC
Copy link
Member Author

PedroHLC commented Aug 8, 2022

Are you sure that the darwin fixes have been included in 22.1.5? I haven't noticed them in the release notes.

I somehow looked the wrong tag, reverting this...

@PedroHLC PedroHLC changed the title mesa: 22.1.4 -> 22.1.5; unpin darwin version mesa: 22.1.4 -> 22.1.5 Aug 8, 2022
@vcunat
Copy link
Member

vcunat commented Aug 8, 2022

SRI: I like to simply paste the hash published on https homepages (example), but I don't really mind.

@PedroHLC
Copy link
Member Author

PedroHLC commented Aug 8, 2022

SRI: I like to simply paste the hash published on https homepages (example), but I don't really mind.

Indeed, that's easier. Reverted...

Instead of keeping the darwin friends outdated, I pulled the fix as a patch, seems fine right? Will ask a colleague to build it...

@PedroHLC
Copy link
Member Author

PedroHLC commented Aug 8, 2022

@ofborg build mesa

@vcunat
Copy link
Member

vcunat commented Aug 8, 2022

That most likely won't work, because the staging rebuilds are normally very large. (and ofborg tries to merge with newest version of the target branch)

@PedroHLC

This comment was marked as outdated.

@vcunat
Copy link
Member

vcunat commented Aug 8, 2022

I only see a failure on aarch64-darwin, though an unrelated one.

@PedroHLC PedroHLC changed the base branch from staging to nixpkgs-unstable August 9, 2022 11:29
@PedroHLC
Copy link
Member Author

PedroHLC commented Aug 9, 2022

@ofborg build mesa

@PedroHLC PedroHLC changed the base branch from nixpkgs-unstable to staging August 9, 2022 11:48
@PedroHLC
Copy link
Member Author

PedroHLC commented Aug 9, 2022

Successful builds in both aarch64 and x86_64 for darwin, against unstable:

I should have run the tests instead of package in ofborg...

@PedroHLC
Copy link
Member Author

PedroHLC commented Aug 9, 2022

@vcunat what do you recommend me to deal with this? Keep the darwin patch (which builds, but I can't test), or revert and just push the bump?

PS: Meanwhile, the "No channel PR" won't re-trigger in the right target.

@vcunat
Copy link
Member

vcunat commented Aug 9, 2022

It sounds good to me this way. I think we've never tested mesa for *-darwin beyond building stuff.

Copy link
Contributor

@superherointj superherointj left a comment

Choose a reason for hiding this comment

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

On linux-x86_64, mesa builds for me. I cannot test for downstream breakage as it's staging. Merging this would be good to let hydra test it fully. Seems good to me for this purpose. If someone else (@vcunat maybe?) approves this, I'd be fine merging this.

@vcunat
Copy link
Member

vcunat commented Aug 10, 2022

Hydra doesn't test much relevant things, and staging branch normally isn't built (immediately). But getting further, into the the next staging-next iteration will create binaries and allow easier testing by people. Either way, patch bumps like this one shouldn't be problematic.

@vcunat
Copy link
Member

vcunat commented Aug 11, 2022

Let's skip to 22.1.6?
https://lists.freedesktop.org/archives/mesa-announce/2022-August/000683.html

@PedroHLC
Copy link
Member Author

22.1.6

In another, less noised PR.

@PedroHLC PedroHLC closed this Aug 11, 2022
@PedroHLC PedroHLC mentioned this pull request Aug 11, 2022
13 tasks
@PedroHLC PedroHLC deleted the mesa-22.1.5 branch August 11, 2022 12:33
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.

None yet

4 participants