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

wayland-protocols: 1.11 -> 1.13 #35324

Merged
merged 1 commit into from Feb 24, 2018
Merged

Conversation

hedning
Copy link
Contributor

@hedning hedning commented Feb 22, 2018

Motivation for this change

1.12 includes the stable XDG Shell Protocol. 1.13 is more minor.

Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

@fpletz
Copy link
Member

fpletz commented Feb 23, 2018

Please target staging for this PR because it is a mass rebuild.

@fpletz fpletz added this to the 18.03 milestone Feb 23, 2018
@hedning hedning changed the base branch from master to staging February 23, 2018 08:28
@hedning
Copy link
Contributor Author

hedning commented Feb 23, 2018

Managed to push before changing the base in github (which triggered review, sorry about that).

Edit: ofborg added a bunch of wrong labels too :(

@vcunat
Copy link
Member

vcunat commented Feb 23, 2018

@grahamc: maybe the labels (except rebuild) would better not be touched until Borg is smarter.

@grahamc
Copy link
Member

grahamc commented Feb 23, 2018

@GrahamcOfBorg eval

I think the problem here is changing the base doesn't trigger a re-eval, and I think this eval ^ will fix all the wrong labels. Do you have additional cases of the labels being definitely wrong, other than the labels not being fixed when the base is changed?

@grahamc
Copy link
Member

grahamc commented Feb 23, 2018

@vcunat ^ if the changed base triggers a re-eval, will that be sufficiently smart? If not, I'd rather err on the side of no features than annoying features.

@Ericson2314 Ericson2314 removed their request for review February 24, 2018 02:14
@vcunat
Copy link
Member

vcunat commented Feb 24, 2018

@grahamc: even if it were against master, I still can't see why the non-rebuild labels were added.

@hedning
Copy link
Contributor Author

hedning commented Feb 24, 2018

To clarify the steps I took: I moved my branch to staging, cherry picked the wayland-protocol commit and force pushed before changing the base in github.

That obviously resulted in a bunch of commits not yet merged in master to show up. Among them I assume there were commits that had new packages, python and cleanup etc.

@vcunat
Copy link
Member

vcunat commented Feb 24, 2018

Ah, right. I thought you just retargeted the PR without any commit changes.

@grahamc
Copy link
Member

grahamc commented Feb 24, 2018

Given what has happened and that re-targeting branches now triggers evals, would you like the topic-tagging to be dropped?

@vcunat vcunat merged commit 8f78969 into NixOS:staging Feb 24, 2018
vcunat added a commit that referenced this pull request Feb 24, 2018
@vcunat
Copy link
Member

vcunat commented Feb 24, 2018

@grahamc: no, hopefully it will be OK now, we'll see.

@hedning hedning deleted the wayland-protocols-bump branch March 1, 2020 11:55
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

5 participants