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

GH Action: merge staging(-next) periodically #105153

Merged
merged 2 commits into from Dec 2, 2020
Merged

GH Action: merge staging(-next) periodically #105153

merged 2 commits into from Dec 2, 2020
+40 −0

Conversation

FRidh
Copy link
Member

@FRidh FRidh commented Nov 27, 2020 •
edited

Automate the merging of master -> staging-next -> staging.

Our main development branch is master. Large rebuilds go to staging.
Periodically, staging is merged into staging-next for stabilization.
When considered sufficiently stable, staging-next is merged into
master.

As changes arrive on these branches, it is important that they're all
updated regularly with eachothers changes. This commit automates that
part.

#104594

Motivation for this change
Things done
  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • 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 nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

@FRidh FRidh requested review from vcunat and zowoq November 27, 2020 14:49
@SuperSandro2000
Copy link
Member

How does this handle merge conflicts and conflicting/undoing changes? Rebasing is also not an option because it could easily create merge conflicts.

@FRidh
Copy link
Member Author

FRidh commented Nov 27, 2020

If there is a merge conflict I would expect this action to fail, resulting in a notification (but for who?).

This probably should be tested on another repo first.

@lukegb
Copy link
Contributor

lukegb commented Nov 27, 2020

You probably want to restrict this to run on the main NixOS/nixpkgs repo (e.g. if: github.repository == ‘NixOS/nixpkgs’)

@FRidh
Copy link
Member Author

FRidh commented Nov 27, 2020 •
edited

Configured it on my fork FRidh@75fe136.
https://github.com/FRidh/nixpkgs/actions?query=workflow%3A%22merge+staging%28-next%29%22

@FRidh
Copy link
Member Author

FRidh commented Nov 28, 2020

Example of a merge conflict https://github.com/FRidh/nixpkgs/runs/1467125543?check_suite_focus=true.

@FRidh
GH Action: merge staging(-next) periodically
24884e5 
Automate the merging of `master` -> `staging-next` -> `staging`.

Our main development branch is `master`. Large rebuilds go to `staging`.
Periodically, `staging` is merged into `staging-next` for stabilization.
When considered sufficiently stable, `staging-next` is merged into
`master`.

As changes arrive on these branches, it is important that they're all
updated regularly with eachothers changes. This commit automates that
part.
@FRidh FRidh marked this pull request as ready for review November 28, 2020 12:44
@FRidh
Copy link
Member Author

FRidh commented Nov 28, 2020

I added a step that would notify on an issue (currently this one) when the workflow fails.

@Mic92
Copy link
Member

Mic92 commented Nov 29, 2020

sounds good.

@FRidh
GH Action: merge staging(-next): comment on failure
318f929 
Comment on the designated issue in case of a failure.

Whoever wants to help out resolving merge conflicts can simply follow
this issue.
@FRidh FRidh merged commit b8edd6c into NixOS:master Dec 2, 2020
This was referenced Dec 5, 2020
Closed
Merged
@github-actions

This comment has been minimized.

Sign in to view
@lukegb
Copy link
Contributor

lukegb commented Dec 6, 2020

I added a step that would notify on an issue (currently this one) when the workflow fails.

Hooray, it worked :^)

@FRidh FRidh deleted the action-merge-staging branch December 6, 2020 08:38
@github-actions GitHub Actions
Copy link
Contributor

Periodic merge from staging-next into staging has failed.

@github-actions GitHub Actions
Copy link
Contributor

Periodic merge from staging-next into staging has failed.

@github-actions GitHub Actions
Copy link
Contributor

Periodic merge from staging-next into staging has failed.

@github-actions GitHub Actions
Copy link
Contributor

Periodic merge from staging-next-23.11 into staging-23.11 has failed.

@github-actions GitHub Actions
Copy link
Contributor

Periodic merge from master into staging-next has failed.

@github-actions GitHub Actions
Copy link
Contributor

Periodic merge from master into staging-next has failed.

@github-actions GitHub Actions
Copy link
Contributor

Periodic merge from master into staging-next has failed.

@github-actions GitHub Actions
Copy link
Contributor

Periodic merge from master into staging-next has failed.

@github-actions GitHub Actions
Copy link
Contributor

Periodic merge from master into staging-next has failed.

@github-actions GitHub Actions
Copy link
Contributor

Periodic merge from master into staging-next has failed.

@github-actions GitHub Actions
Copy link
Contributor

Periodic merge from master into staging-next has failed.

@github-actions GitHub Actions
Copy link
Contributor

Periodic merge from master into staging-next has failed.

@github-actions GitHub Actions
Copy link
Contributor

Periodic merge from master into staging-next has failed.

@github-actions GitHub Actions
Copy link
Contributor

Periodic merge from master into staging-next has failed.

@github-actions GitHub Actions
Copy link
Contributor

Periodic merge from master into staging-next has failed.

@github-actions GitHub Actions
Copy link
Contributor

Periodic merge from master into haskell-updates has failed.

@github-actions GitHub Actions
Copy link
Contributor

Periodic merge from staging-next-23.11 into staging-23.11 has failed.

@github-actions GitHub Actions
Copy link
Contributor

Periodic merge from master into staging-next has failed.

@github-actions GitHub Actions
Copy link
Contributor

Periodic merge from master into staging-next has failed.

@github-actions GitHub Actions
Copy link
Contributor

Periodic merge from master into staging-next has failed.

@github-actions GitHub Actions
Copy link
Contributor

Periodic merge from master into staging-next has failed.

@github-actions GitHub Actions
Copy link
Contributor

Periodic merge from master into staging-next has failed.

@github-actions GitHub Actions
Copy link
Contributor

Periodic merge from master into staging-next has failed.

@github-actions GitHub Actions
Copy link
Contributor

Periodic merge from master into staging-next has failed.

@github-actions GitHub Actions
Copy link
Contributor

Periodic merge from master into staging-next has failed.

@github-actions GitHub Actions
Copy link
Contributor

Periodic merge from master into staging-next has failed.

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented May 1, 2024

Periodic merge from master into staging-next has failed.

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented May 1, 2024

Periodic merge from master into staging-next has failed.

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented May 2, 2024

Periodic merge from master into staging-next has failed.

@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented May 2, 2024

Periodic merge from master into staging-next has failed.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Mic92 Mic92 Mic92 left review comments

@zowoq zowoq zowoq left review comments

@vcunat vcunat Awaiting requested review from vcunat

@edolstra edolstra Awaiting requested review from edolstra

Assignees
No one assigned
Labels
0.kind: enhancement 6.topic: policy discussion 10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
9 participants
@FRidh @SuperSandro2000 @lukegb @Mic92 @primeos @jtojnar @mweinelt @chrissyjai @zowoq