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: Backport RPM packaging to 1.x branch #9809

Merged
merged 2 commits into from
May 29, 2024
Merged

feat: Backport RPM packaging to 1.x branch #9809

merged 2 commits into from
May 29, 2024

Conversation

hjmallon
Copy link

feat(bundler): Add RPM packaging, closes #4402 (#5202)

  • feat(bundler): Add RPM packaging

  • feat(bundler): Update 'rpm' to 0.13.1

  • Fix fmt

This is a backport of #5202 to the v1 branch

@hjmallon hjmallon requested a review from a team as a code owner May 17, 2024 17:10
@hjmallon hjmallon mentioned this pull request May 17, 2024
Open
@FabianLars FabianLars self-assigned this May 18, 2024
FabianLars
FabianLars requested changes May 21, 2024
View reviewed changes
Copy link
Member

@FabianLars FabianLars left a comment •
edited

Choose a reason for hiding this comment

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

Thank you! This time i'm quicker to review your PR 😅

Just a few minor things i could have added myself but since i'm waiting on #9796 (comment) we still have some time

tooling/bundler/src/bundle/linux/rpm.rs Outdated Show resolved Hide resolved
tooling/bundler/Cargo.toml Outdated Show resolved Hide resolved
.changes/bundler-rpm.md Outdated Show resolved Hide resolved
.changes/bundler-rpm.md Outdated Show resolved Hide resolved
@olivierlemasle @hjmallon
feat(bundler): Add RPM packaging, closes tauri-apps#4402 (tauri-apps#…
166a894 
…5202)

* feat(bundler): Add RPM packaging

* feat(bundler): Update 'rpm' to 0.13.1

* Fix fmt
@hjmallon
Copy link
Author

@FabianLars : One of the CI tests is failing for me, but I think it is because I get the following diff on this branch atm after building, it seems unrelated to my change so I dont think I should integrate it?

diff --git a/Cargo.lock b/Cargo.lock
index bab6a8118..3e5aed09a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -4021,7 +4021,7 @@ checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f"
 
 [[package]]
 name = "tauri"
-version = "1.6.5"
+version = "1.6.6"
 dependencies = [
  "anyhow",
  "base64 0.21.7",

@FabianLars
Copy link
Member

We'll probably merge another pr before yours which will include this change. If you want to have green ci already you can just include this change. It's just some annoyance of our publishing pipeline :/

FabianLars
FabianLars approved these changes May 28, 2024
View reviewed changes
Copy link
Member

@FabianLars FabianLars left a comment

Choose a reason for hiding this comment

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

I didn't test it yet because I'm still not home (send help pls) but considering it's a backport, seeing that CI is happy and with my comments being resolved I think this is good to go.

@FabianLars
Copy link
Member

P.S. Big thanks for the contribution :)

@FabianLars
Copy link
Member

P.P.S. I swear I'll check your dmg backport when I'm back x)

@hjmallon
Copy link
Author

P.P.S. I swear I'll check your dmg backport when I'm back x)

Thanks, I will rebase it tomorrow ready to go

@lucasfernog lucasfernog merged commit 253595a into tauri-apps:1.x May 29, 2024
32 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@FabianLars FabianLars FabianLars approved these changes

Assignees

@FabianLars FabianLars

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@hjmallon @FabianLars @lucasfernog @olivierlemasle