robur/unikernel-repo
4
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

WIP: Import qubes-miragevpn-xen.opam as-is #3

Draft
reynir wants to merge 1 commit from miragevpn-qubes into main
pull from: miragevpn-qubes
merge into: robur:main
Conversation 2 Commits 1 Files changed 1 +16 -14
reynir commented 2024-10-01 11:37:34 +00:00
Owner
Copy link

It will need some adjustments. Notably, we need to strip the binary while keeping the original as .debug. But there are also other changes in the output I'd like to investigate. Depends on https://github.com/robur-coop/qubes-miragevpn/pull/14 being merged.

It will need some adjustments. Notably, we need to strip the binary while keeping the original as .debug. But there are also other changes in the output I'd like to investigate. Depends on https://github.com/robur-coop/qubes-miragevpn/pull/14 being merged.
reynir added 1 commit 2024-10-01 11:37:35 +00:00 
It will need some adjustments...
hannes commented 2024-10-01 11:57:49 +00:00
Owner
Copy link

When I add unikernels to the repository (or update them), I indeed apply the old build instructions (to copy & strip & retain as .debug), and also the old synopsis (or write an appropriate one - since that's used by builder-web), remove description (not needed, and pretty useless).

When I add unikernels to the repository (or update them), I indeed apply the old build instructions (to copy & strip & retain as .debug), and also the old synopsis (or write an appropriate one - since that's used by builder-web), remove description (not needed, and pretty useless).
hannes commented 2024-10-01 11:59:22 +00:00
Owner
Copy link

while that being a job that could be automated, I haven't bothered to do so.I suspect some opam-2-way-merge utility using the opam library to use build & description etc. from (a) and the deps from (b) would be suitable. But I'm not sure whether it is worth the time.

while that being a job that could be automated, I haven't bothered to do so.I suspect some opam-2-way-merge utility using the opam library to use build & description etc. from (a) and the deps from (b) would be suitable. But I'm not sure whether it is worth the time.
This pull request is marked as a work in progress.
This branch is out-of-date with the base branch
View command line instructions

Checkout

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

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 miragevpn-qubes
git checkout miragevpn-qubes
git rebase main
git checkout main
git merge --ff-only miragevpn-qubes
git checkout miragevpn-qubes
git rebase main
git checkout main
git merge --no-ff miragevpn-qubes
git checkout main
git merge --squash miragevpn-qubes
git checkout main
git merge --ff-only miragevpn-qubes
git checkout main
git merge miragevpn-qubes
git push origin main
Sign in to join this conversation.
Reviewers
No reviewers
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
2 participants
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: robur/unikernel-repo#3
No description provided.
Delete branch "miragevpn-qubes"

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?