Skip to content

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

Merged
merged 1 commit into from
May 16, 2025

Conversation

Timshel
Copy link
Contributor

@Timshel Timshel commented Mar 5, 2025

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.

@stefan0xC
Copy link
Contributor

stefan0xC commented Mar 6, 2025

The commit id 172cbd2e77e235e0eead6bb5022ad9185a45cafd is the web-v2025.2.2 tag. I have not yet merged the changeset for the v2025.2.2 branch vaultwarden/vw_web_builds#8 so this currently would still use the unpatched version.

edit: I've merged it, so it should be changed to vaultwarden/vw_web_builds@2974170

@Timshel
Copy link
Contributor Author

Timshel commented Mar 6, 2025

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.
Updated to vaultwarden/vw_web_builds@31e5dd1 which I believe is latest now.

@stefan0xC
Copy link
Contributor

Ah, yeah, "Rebase and merge" also changes the commit id.

@Timshel
Copy link
Contributor Author

Timshel commented Apr 3, 2025

@stefan0xC do you plan to update the v2025.3.1 branch ?

Edit:
A yes missed vaultwarden/vw_web_builds#14, if merged I can update the build script.

@stefan0xC
Copy link
Contributor

It has been merged.

@Timshel
Copy link
Contributor Author

Timshel commented Apr 3, 2025

Updated to vaultwarden/vw_web_builds@19f6dee

@BlackDex
Copy link
Collaborator

Yea, this seems like a good starting point for the short term.

I'm only missing a good way of working for the vw_web_builds.
Like, how do we keep in-sync with upstream.
Do we keep the main branch 1:1 in-sync with upstream
Should we create an own main branch, like vw_main which we link to a specific client tagged version?
And when a new version is released by Bitwarden, we sync that branch to a specific tag/hash and apply changes if needed?
And, then tag our custom versions upon the vw_main branch?

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.

@Timshel
Copy link
Contributor Author

Timshel commented Apr 15, 2025

I believe the current process used @stefan0xC is working well:

  • Creating a new branch for each Bitwarden release.
  • Rebasing the modifications on top of the tag.

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 main branch.

Only suggestion I would add is later on to move the release code from this repository to the main branch of vw_web_builds.

This would allow to :

  • Use only one repository / archive this one.
  • The main branch would then have a reference to the latest release.

@stefan0xC
Copy link
Contributor

I' have skipped the separate PR step for my changeset and just pushed a new v2025.4.1 branch directly. If we adopt this PR we would still have to update the pointer to the branch we want to build, etc.

Copy link
Contributor

@stefan0xC stefan0xC Apr 29, 2025

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.

Copy link
Contributor

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).

Copy link
Contributor Author

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 ?

@stefan0xC
Copy link
Contributor

stefan0xC commented Apr 29, 2025

Oh, and I've just realized that I have forgotten to remove the bitwarden_license code from newer versions of the web-vault (ever since vaultwarden/vw_web_builds#2 has been merged). So this would have to be rectified in our fork as well because without the apply_patches.sh script those files will not be removed after checkout anymore.
edit: done vaultwarden/vw_web_builds@44d5a4b

@Timshel
Copy link
Contributor Author

Timshel commented May 8, 2025

web-v2025.4.2 was released maybe we could try to make the release using this PR ?

@BlackDex
Copy link
Collaborator

BlackDex commented May 8, 2025

web-v2025.4.2 was released maybe we could try to make the release using this PR ?

Sounds good to me.

@stefan0xC
Copy link
Contributor

web-v2025.4.2 was released maybe we could try to make the release using this PR ?

I've added the changeset for v2025.4.2. cf. vaultwarden/vw_web_builds@b9151b7

@BlackDex
Copy link
Collaborator

Well, the CI Build seems to have passed and created a tar file.
So, that is nice.

@stefan0xC
Copy link
Contributor

stefan0xC commented May 15, 2025

I've updated the web-vault for the new v2025.5.0 and noticed that since web-2025.4.1 the create new organization screen throws an exception because this.taxComponent is not defined.
grafik

I've updated the branches to disable the sales tax accordingly:
vaultwarden/vw_web_builds@80c6b74 (v2025.4.2)
vaultwarden/vw_web_builds@93c4d42 (v2025.5.0)

@Timshel
Copy link
Contributor Author

Timshel commented May 15, 2025

Updated to point to v2025.5.0.

@BlackDex BlackDex merged commit a84aca5 into dani-garcia:master May 16, 2025
1 check passed
@Timshel Timshel deleted the prepatched branch May 16, 2025 13:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants