Skip to content
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.

Sign up for GitHub

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

Jump to bottom

[Backport release-23.11] bitwarden: fix build; 2023.12.0 -> 2023.12.1 #278306

Merged
merged 2 commits into from
Jan 3, 2024
Merged

[Backport release-23.11] bitwarden: fix build; 2023.12.0 -> 2023.12.1 #278306

merged 2 commits into from
Jan 3, 2024

Conversation

github-actions[bot]
Copy link
Contributor

@github-actions github-actions bot commented Jan 2, 2024

Bot-based backport to release-23.11, triggered by a label in #278289.

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

amarshall and others added 2 commits January 2, 2024 16:57
@amarshall @github-actions
bitwarden: Filter patches for cargo sourceRoot
1610118 
Since we pass `sourceRoot` to `fetchCargoTarball`, any patches that
affect files outside of that `sourceRoot` will fail to apply. So map
each patch to remove any diff hunks outside that `sourceRoot`.

This was only working before due to the FOD being cached from before
such problematic patches were added (in commit
333dadb).

(cherry picked from commit 9201c2e)
@dotlambda @github-actions
bitwarden: 2023.12.0 -> 2023.12.1
d706b8d 
Diff: bitwarden/clients@desktop-v2023.12.0...desktop-v2023.12.1

Changelog: https://github.com/bitwarden/clients/releases/tag/desktop-v2023.12.1
(cherry picked from commit 31928d0)
@github-actions github-actions bot mentioned this pull request Jan 2, 2024
Merged
13 tasks
@ofborg ofborg bot requested review from Kiwi and amarshall January 2, 2024 17:43
@ofborg ofborg bot added 10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 10.rebuild-linux: 1 labels Jan 2, 2024
amarshall
amarshall approved these changes Jan 3, 2024
View reviewed changes
Copy link
Member

@amarshall amarshall left a comment •
edited
Loading

Choose a reason for hiding this comment

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

Tested build and basic func on x86_64-linux

@delroth delroth added 12.approvals: 1 This PR was reviewed and approved by one reputable person 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in the package labels Jan 3, 2024
@wegank wegank merged commit fc08cc3 into release-23.11 Jan 3, 2024
22 of 23 checks passed
@wegank wegank deleted the backport-278289-to-release-23.11 branch January 3, 2024 04:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@amarshall amarshall amarshall approved these changes

@Kiwi Kiwi Awaiting requested review from Kiwi

Assignees
No one assigned
Labels
10.rebuild-darwin: 0 This PR does not cause any packages to rebuild on Darwin 10.rebuild-linux: 1-10 10.rebuild-linux: 1 12.approvals: 1 This PR was reviewed and approved by one reputable person 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in the package
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@amarshall @delroth @wegank @dotlambda