Skynet/nixos
6
1
Fork 0
Code Issues 43 Pull requests 1 Projects Releases Packages Wiki Activity Actions

#25 Gitlab backup options #116

Open
esy wants to merge 6 commits from gitlab_backup into main
pull from: gitlab_backup
merge into: Skynet:main
Conversation 7 Commits 6 Files changed 1 +13
esy commented 2024-03-25 12:05:40 +00:00 (Migrated from gitlab.skynet.ie)
Copy link

Added backup options for gitlab - #25

Added backup options for gitlab - #25
esy commented 2024-03-25 12:13:26 +00:00 (Migrated from gitlab.skynet.ie)
Copy link

added 1 commit

Compare with previous version

added 1 commit <ul><li>292c977e - fix: variables are cool</li></ul> [Compare with previous version](/compsoc1/skynet/nixos/-/merge_requests/31/diffs?diff_id=443&start_sha=fb4685797bd43109a8b62fc42555a6276591a644)
esy commented 2024-03-25 12:56:08 +00:00 (Migrated from gitlab.skynet.ie)
Copy link

added 1 commit

  • 4312f438 - fix: can't use packages, redundant comment removed

Compare with previous version

added 1 commit <ul><li>4312f438 - fix: can&#39;t use packages, redundant comment removed</li></ul> [Compare with previous version](/compsoc1/skynet/nixos/-/merge_requests/31/diffs?diff_id=445&start_sha=292c977ec150f23621a5fb067727c6a237ea3b7d)
esy commented 2024-03-25 13:23:41 +00:00 (Migrated from gitlab.skynet.ie)
Copy link

added 1 commit

Compare with previous version

added 1 commit <ul><li>51607a22 - fix: removed missing option</li></ul> [Compare with previous version](/compsoc1/skynet/nixos/-/merge_requests/31/diffs?diff_id=447&start_sha=4312f438eea80182990cf80cbc4d85022d5f0edb)
esy commented 2024-03-25 15:58:28 +00:00 (Migrated from gitlab.skynet.ie)
Copy link

added 1 commit

Compare with previous version

added 1 commit <ul><li>036dd607 - added tar option for restic</li></ul> [Compare with previous version](/compsoc1/skynet/nixos/-/merge_requests/31/diffs?diff_id=449&start_sha=51607a22ca27906b691262691e4c3ca5b53e74d7)
silver commented 2024-03-28 13:11:04 +00:00 (Migrated from gitlab.skynet.ie)
Copy link

Looks good, the only thing though is that its better to have comments above the code its dealing with, not to teh side.

Looks good, the only thing though is that its better to have comments above the code its dealing with, not to teh side.
silver commented 2024-03-28 13:11:04 +00:00 (Migrated from gitlab.skynet.ie)
Copy link

Aside from teh comments its all good

Aside from teh comments its all good
silver commented 2024-03-28 13:13:33 +00:00 (Migrated from gitlab.skynet.ie)
Copy link

Might actually be worth initially commenting out https://gitlab.skynet.ie/compsoc1/skynet/nixos/-/merge_requests/31/diffs#1be1707ef3ae96ac21d81d63813e341c4f22d296_181_183 just to see what the gitlab backup outputs

And enable the restic backup at a later date?

Might actually be worth initially commenting out https://gitlab.skynet.ie/compsoc1/skynet/nixos/-/merge_requests/31/diffs#1be1707ef3ae96ac21d81d63813e341c4f22d296_181_183 just to see what the gitlab backup outputs And enable the restic backup at a later date?
This pull request is broken due to missing fork information.
View command line instructions

Checkout

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

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 checkout main
git merge --no-ff gitlab_backup
git checkout gitlab_backup
git rebase main
git checkout main
git merge --ff-only gitlab_backup
git checkout gitlab_backup
git rebase main
git checkout main
git merge --no-ff gitlab_backup
git checkout main
git merge --squash gitlab_backup
git checkout main
git merge --ff-only gitlab_backup
git checkout main
git merge gitlab_backup
git push origin main
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
Draft

   
ITD Ticket

   
Improvement

   
Logging

   
Trainee

   
bugfix
No labels
Draft
ITD Ticket
Improvement
Logging
Trainee
bugfix
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: Skynet/nixos#116
No description provided.
Delete branch "gitlab_backup"

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?