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

feat(bundler): add provides, conflicts and replaces for deb and rpm #9942

Merged
merged 5 commits into from
Jun 4, 2024
Merged

feat(bundler): add provides, conflicts and replaces for deb and rpm #9942

merged 5 commits into from
Jun 4, 2024

Conversation

Pylogmon
Copy link
Contributor

@Pylogmon Pylogmon commented Jun 2, 2024 •
edited by amrbashir
Loading

This PR added support for provides, conflicts and replaces (obsoletes for RPM) options for bundler > deb and bundler > rpm configs.

Backport of #9331

@Pylogmon Pylogmon requested a review from a team as a code owner June 2, 2024 08:13
@Pylogmon Pylogmon marked this pull request as draft June 2, 2024 08:27
@Pylogmon Pylogmon changed the title feat(bundler): Add provides conflicts replaces field for deb control file. feat(bundler): add provides, conflicts and replaces for deb and rpm Jun 2, 2024
@Pylogmon Pylogmon marked this pull request as ready for review June 2, 2024 08:36
amrbashir
amrbashir previously approved these changes Jun 3, 2024
View reviewed changes
amrbashir
amrbashir requested changes Jun 3, 2024
View reviewed changes
Copy link
Member

@amrbashir amrbashir left a comment

Choose a reason for hiding this comment

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

looks like you need to fix cargo fmt and cargo clippy, thanks for contribution

@Pylogmon Pylogmon requested a review from amrbashir June 4, 2024 01:10
@Pylogmon
Copy link
Contributor Author

Pylogmon commented Jun 4, 2024

BTW, if I want to use the latest feature before the next 1.x release, what should I do? In Cargo.toml, I can directly rely on git, but I don't know what to do in package.json.

@amrbashir
Copy link
Member

Checkout https://tauri.app/v1/guides/faq

amrbashir
amrbashir previously approved these changes Jun 4, 2024
View reviewed changes
@amrbashir amrbashir merged commit 78fc841 into tauri-apps:1.x Jun 4, 2024
32 checks passed
@amrbashir
Copy link
Member

Thanks for contribution

@zent1n0
Copy link

zent1n0 commented Jun 9, 2024

Will there be a cherry-pick into branch 1.6 for the backport please? Or it's not planned in 1.6.x yet?

@amrbashir
Copy link
Member

No, it will be in 1.7

@github-actions github-actions bot mentioned this pull request Jun 25, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@amrbashir amrbashir amrbashir approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@Pylogmon @amrbashir @zent1n0