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.

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

add appimage support to packaging #1270

Merged
merged 11 commits into from
Oct 2, 2024

Conversation

TheTollingBell
Copy link
Contributor

@TheTollingBell TheTollingBell commented Sep 11, 2024

This resolves issue #1222.

Potential problems:

  • This does the building of image after the deb and before the rpm. If the ordering matters just say the word and I'll change it.
  • Someone with a more intimate knowledge of Haveno should look at the Haveno.desktop file to see if it fits with the projects theme.

@TheTollingBell
Copy link
Contributor Author

TheTollingBell commented Sep 11, 2024

Apparently, running AppImage's (like the appimagetool AppImage) would require some changes to the CI. I'm looking into it now. I'm probably going to end up just using the prebuilt binaries instead.

TheTollingBell and others added 5 commits September 11, 2024 00:59
Changed name of AppImage to confirm with the naming scheme of other artifacts.
Use a underscore instead of hyphen
@TheTollingBell
Copy link
Contributor Author

TheTollingBell commented Sep 11, 2024

Probably something to note in a separate issue, but packaging the entire project once as a jpackage app-image and then doing separate packaging off of that would significantly improve CI time.

@TheTollingBell
Copy link
Contributor Author

@woodser Can I get a review on this?

@woodser
Copy link
Contributor

woodser commented Sep 12, 2024

@Jabster28 Mind reviewing this? :) I'm not running Linux at the moment.

Copy link
Contributor

@Jabster28 Jabster28 left a comment

Choose a reason for hiding this comment

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

Yep works on my machine. A few pedantic notes about the .desktop file, but it'd be fine to merge as-is. I'll let you know when the sample trade completes.

desktop/package/linux/Haveno.AppDir/Haveno.desktop Outdated Show resolved Hide resolved
desktop/package/linux/Haveno.AppDir/Haveno.desktop Outdated Show resolved Hide resolved
desktop/package/linux/Haveno.AppDir/.DirIcon Outdated Show resolved Hide resolved
desktop/package/linux/Haveno.AppDir/Haveno.desktop Outdated Show resolved Hide resolved
desktop/package/package.gradle Show resolved Hide resolved
more descriptive comment
add categories
add attributes specific to `AppImage`
desktop/package/package.gradle Show resolved Hide resolved
desktop/package/linux/Haveno.AppDir/.DirIcon Outdated Show resolved Hide resolved
@TheTollingBell
Copy link
Contributor Author

Everything should be up to date with your suggestions.

Copy link
Contributor

@Jabster28 Jabster28 left a comment

Choose a reason for hiding this comment

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

LGTM. @woodser you might want to check the changes to the gradle for formatting etc but everything functionally looks perfect.

@TheTollingBell
Copy link
Contributor Author

Hey, @woodser, is there a problem with the Gradle file formatting or is this good to merge?

@woodser
Copy link
Contributor

woodser commented Sep 30, 2024

Hi @TheTollingBell, please rebase on master.

@TheTollingBell
Copy link
Contributor Author

@woodser Rebased and added AppImage artifact

@woodser
Copy link
Contributor

woodser commented Oct 1, 2024

Thanks.

@woodser woodser mentioned this pull request Oct 1, 2024
@woodser
Copy link
Contributor

woodser commented Oct 2, 2024

@TheTollingBell There's still a merge conflict with master. Once that's resolved I can merge this.

Edit: Nevermind, I can merge by squashing your commits :)

@woodser
Copy link
Contributor

woodser commented Oct 2, 2024

@TheTollingBell Actually there is a merge commit which has conflicts with master. Please do squash your commits to a single commit and rebase on master. Thanks!

Copy link

Coverage summary from Codacy

See diff coverage on Codacy

Coverage variation Diff coverage
+0.00%
Coverage variation details
Coverable lines Covered lines Coverage
Common ancestor commit (ea3f099) 41334 4746 11.48%
Head commit (cf94753) 41334 (+0) 4746 (+0) 11.48% (+0.00%)

Coverage variation is the difference between the coverage for the head and common ancestor commits of the pull request branch: <coverage of head commit> - <coverage of common ancestor commit>

Diff coverage details
Coverable lines Covered lines Diff coverage
Pull request (#1270) 0 0 ∅ (not applicable)

Diff coverage is the percentage of lines that are covered by tests out of the coverable lines that the pull request added or modified: <covered lines added or modified>/<coverable lines added or modified> * 100%

See your quality gate settings    Change summary preferences

Codacy stopped sending the deprecated coverage status on June 5th, 2024. Learn more

@woodser woodser merged commit 61158e9 into haveno-dex:master Oct 2, 2024
16 checks passed
@woodser
Copy link
Contributor

woodser commented Oct 2, 2024

Nevermind was able to work through it. :)

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