-
Notifications
You must be signed in to change notification settings - Fork 105
Build using prepatched vaultwarden/vw_web_builds #191
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Conversation
The commit id edit: I've merged it, so it should be changed to vaultwarden/vw_web_builds@2974170 |
Yes, I was aware just wanted to point to the correct branch, not an external repository and for testing build even an unpatched one was enough. |
Ah, yeah, "Rebase and merge" also changes the commit id. |
Edit: |
It has been merged. |
Updated to vaultwarden/vw_web_builds@19f6dee |
Yea, this seems like a good starting point for the short term. I'm only missing a good way of working for the It might be best if we have a document on how to work on that so that we can't make a weird mistake (Which is always possible of course). I have never maintained a fork with my own changes and try to keep upstream patches/changes in sync. So i have no real clue. I might have a general idea though. |
I believe the current process used @stefan0xC is working well:
With this process I believe preparing a new release is as simple as starting from the previous version and using an interactive rebase on top of the new tag to ensure to keep only the Vaultwarden modifications and fixing the conflicts. This allows to easily keep track of each release and do not require to force push on a Only suggestion I would add is later on to move the release code from this repository to the This would allow to :
|
I' have skipped the separate PR step for my changeset and just pushed a new |
scripts/generate_patch_file.sh
Outdated
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not sure if we should remove it right now. I think for reviewing changes it's probably good to have a way to create a new patch file (though this script does not work anymore because we would actually need to compare the changes from the web-vault tag from the bitwarden/clients repository to the branch from the vaultwarden repository). I think it's probably fine to remove it but pointing it out because we probably also have to update the documentation accordingly.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I mean we could also add the web-v
tags to the vw_web_builds repository to make it easier to compare as well. 🤔
For new changes they'd have to be made in the https://github.com/vaultwarden/vw_web_builds repository as well (unless they concern the building of the repository).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I removed it to keep only the script files used, otherwise it gets a bit confusing I believe.
As I mentioned elsewhere I would suggest moving the release code in vaultwarden/vw_web_builds
main
branch, then the Readme could be modified at this time, but I can make some modifications if you prefer ?
Oh, and I've just realized that I have forgotten to remove the |
0f865ec
to
30527e1
Compare
|
Sounds good to me. |
I've added the changeset for |
Well, the CI Build seems to have passed and created a tar file. |
I've updated the web-vault for the new I've updated the branches to disable the sales tax accordingly: |
Updated to point to |
In reference of #137
Build the project using an already patched vaultwarden/vw_web_builds.
Cleanup the scripts and tested the docker build and
make full
.