DGNum/colmena
10
0
Fork 3
Code Issues 6 Pull requests 6 Projects Releases Packages Wiki Activity

feat(colmena-nix-darwin-server): init #21

Open
ecoppens wants to merge 29 commits from feature/colmena-nix-darwin-server into feature/custom-activation
pull from: feature/colmena-nix-darwin-server
merge into: DGNum:feature/custom-activation
Conversation 0 Commits 29 Files changed 84 +3136 -420
ecoppens commented 2025-09-11 23:04:41 +02:00
Owner
Copy link
No description provided.
ecoppens force-pushed feature/colmena-nix-darwin-server from 06b7160ba4 to a946595030 2025-09-11 23:05:19 +02:00 Compare
ecoppens force-pushed feature/colmena-nix-darwin-server from e311339b2e to a7c26ecf3d 2025-09-13 17:29:43 +02:00 Compare
This pull request has changes conflicting with the target branch.
  • Cargo.lock
  • Cargo.toml
  • colmena-nixos-server/src/service.rs
  • colmena-proto/activation/apply_request.proto
  • colmena-proto/activation/build_request.proto
  • colmena/src/nix/host/custom.rs
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin feature/colmena-nix-darwin-server:feature/colmena-nix-darwin-server
git switch feature/colmena-nix-darwin-server

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch feature/custom-activation
git merge --no-ff feature/colmena-nix-darwin-server
git switch feature/colmena-nix-darwin-server
git rebase feature/custom-activation
git switch feature/custom-activation
git merge --ff-only feature/colmena-nix-darwin-server
git switch feature/colmena-nix-darwin-server
git rebase feature/custom-activation
git switch feature/custom-activation
git merge --no-ff feature/colmena-nix-darwin-server
git switch feature/custom-activation
git merge --squash feature/colmena-nix-darwin-server
git switch feature/custom-activation
git merge --ff-only feature/colmena-nix-darwin-server
git switch feature/custom-activation
git merge feature/colmena-nix-darwin-server
git push origin feature/custom-activation
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels
  
bug

Something is not working

  
duplicate

This issue or pull request already exists

  
enhancement

New feature

  
help wanted

Need some help

  
invalid

Something is wrong

  
question

More information is needed

  
wontfix

This won't be fixed

No labels
bug
duplicate
enhancement
help wanted
invalid
question
wontfix
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: DGNum/colmena#21
No description provided.
Delete branch "feature/colmena-nix-darwin-server"

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?