Skip to content

Comments

[Backport release-24.05] bitwarden-desktop: 2024.6.4 -> 2024.8.0#337322

Merged
emilazy merged 1 commit intorelease-24.05from
backport-337164-to-release-24.05
Aug 26, 2024
Merged

[Backport release-24.05] bitwarden-desktop: 2024.6.4 -> 2024.8.0#337322
emilazy merged 1 commit intorelease-24.05from
backport-337164-to-release-24.05

Conversation

@github-actions
Copy link
Contributor

Bot-based backport to release-24.05, triggered by a label in #337164.

  • Before merging, ensure that this backport is acceptable for the release.
    • Even as a non-commiter, if you find that it is not acceptable, leave a comment.

Diff: bitwarden/clients@desktop-v2024.6.4...desktop-v2024.8.0

Changelog: https://github.com/bitwarden/clients/releases/tag/desktop-v2024.7.1
           https://github.com/bitwarden/clients/releases/tag/desktop-v2024.8.0

- The postPatch to fixup broken package{,-lock}.json in upstream seems
  to be no longer needed, so (happily) remove
- Python 3.12 removed distutils, so get it from setuptools
- Workaround broken node-argon2 dependency due to being updated (see
  inline comment)
- desktop_native/napi was split out of desktop_native, so adjust
  accordingly

Co-authored-by: Robert Schütz <mail@dotlambda.de>
(cherry picked from commit ac2fdbe)
@emilazy
Copy link
Member

emilazy commented Aug 25, 2024

@ofborg build bitwarden-desktop

@ofborg ofborg bot requested a review from amarshall August 25, 2024 20:50
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. labels Aug 25, 2024
Copy link
Member

@amarshall amarshall left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested build (switched to electron_31-bin to avoid building it locally), cannot test running currently due to DRI driver mismatch with unstable.

@emilazy emilazy merged commit 787c876 into release-24.05 Aug 26, 2024
@emilazy emilazy deleted the backport-337164-to-release-24.05 branch August 26, 2024 22:41
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants