the-distro/infra
9
0
Fork 5
Code Issues 37 Pull requests 7 Packages Projects 1 Releases Wiki Activity

Figure out staging (+one-way-sync) workflow #78

New issue
Open
opened 2024-07-22 22:39:47 +00:00 by yu-re-ka · 0 comments
yu-re-ka commented 2024-07-22 22:39:47 +00:00
Owner
Copy link

We want to keep forkos/master synchronized with github:nixos/nixpkgs/master for now.

The one-way-sync workflow we have works fine, until a github:nixos/nixpkgs/staging-next gets merged into github:nixos/nixpkgs/master, and then it will keep failing because it will refuse to merge the staging changes into our master automatically.

If we want to do independent staging cycles, we need to figure out some new way to make that work with the one-way-sync.

We want to keep forkos/master synchronized with github:nixos/nixpkgs/master for now. The one-way-sync workflow we have works fine, _until_ a github:nixos/nixpkgs/staging-next gets merged into github:nixos/nixpkgs/master, and then it will keep failing because it will refuse to merge the staging changes into our master automatically. If we want to do independent staging cycles, we need to figure out some new way to make that work with the one-way-sync.
Sign in to join this conversation.
No Branch/Tag specified
Branches Tags
main
vault
storage-project
block-crawlers
fix-buildbot
lukegb/rule-94
cache-lix
build02-lix
lukegb/uptime-kuma-root
hydra-metrics
builder
email-groups
cache-ipv4
format
hexchen/colmena-checker
hexy/credentials
buildbot
ckie/moarr-v4
gerrit-metrics
moar-builders
unplug-epyc
hydra-wire-up
alertmanager
fodwatch
cadvisor-containers
gerrit-http-clones
meta01
No results found.
Labels
Clear labels
No items
No labels
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference: the-distro/infra#78
No description provided.
Delete branch "%!s()"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?