lix-project/nix-eval-jobs
2
1
Fork 4
Code Issues 1 Pull requests 2 Packages Projects Releases Wiki Activity

Update Lix #18

Open
vriska wants to merge 1 commit from vriska/nix-eval-jobs:update-lix into main
pull from: vriska/nix-eval-jobs:update-lix
merge into: lix-project:main
Conversation 0 Commits 1 Files changed 5 +26 -20
vriska commented 2024-11-29 21:54:33 +00:00
Member
Copy link

Seems to work. Most relevant Lix changes are from this morning.

I noticed that treefmt wanted quite a few changes in the existing tree, so I didn't run it.

Seems to work. Most relevant Lix changes are from this morning. I noticed that treefmt wanted quite a few changes in the existing tree, so I didn't run it.
vriska added 1 commit 2024-11-29 21:54:38 +00:00
This pull request has changes conflicting with the target branch.
  • flake.lock
  • src/drv.cc
  • src/nix-eval-jobs.cc
  • src/worker.cc
  • src/worker.hh
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u update-lix:vriska-update-lix
git checkout vriska-update-lix

Merge

Merge the changes and update on Forgejo.
git checkout main
git merge --no-ff vriska-update-lix
git checkout main
git merge --ff-only vriska-update-lix
git checkout vriska-update-lix
git rebase main
git checkout main
git merge --no-ff vriska-update-lix
git checkout main
git merge --squash vriska-update-lix
git checkout main
git merge --ff-only vriska-update-lix
git checkout main
git merge vriska-update-lix
git push origin main
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
Kind/Breaking

Breaking change that won't be backward compatible

  
Kind/Bug

Something is not working

  
Kind/Documentation

Documentation changes

  
Kind/Enhancement

Improve existing functionality

  
Kind/Feature

New functionality

  
Kind/Security

This is security issue

  
Kind/Testing

Issue or pull request related to testing

  
Priority
Critical
The priority is critical

  
Priority
High
The priority is high

  
Priority
Low
The priority is low

  
Priority
Medium
The priority is medium

  
Reviewed
Confirmed
Issue has been confirmed

  
Reviewed
Duplicate
This issue or pull request already exists

  
Reviewed
Invalid
Invalid issue

  
Reviewed
Won't Fix
This issue won't be fixed

  
Status
Abandoned
Somebody has started to work on this but abandoned work

  
Status
Blocked
Something is blocking this issue or pull request

  
Status
Need More Info
Feedback is required to reproduce issue or to continue work

No labels
Kind/Breaking
Kind/Bug
Kind/Documentation
Kind/Enhancement
Kind/Feature
Kind/Security
Kind/Testing
Priority
Critical
Priority
High
Priority
Low
Priority
Medium
Reviewed
Confirmed
Reviewed
Duplicate
Reviewed
Invalid
Reviewed
Won't Fix
Status
Abandoned
Status
Blocked
Status
Need More Info
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: lix-project/nix-eval-jobs#18
No description provided.
Delete branch "vriska/nix-eval-jobs:update-lix"

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?