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

CI/Linux: Build/publish Docker images used to create AppImages #697

Merged
merged 2 commits into from
Sep 29, 2024

Conversation

guihkx
Copy link
Collaborator

@guihkx guihkx commented Sep 12, 2024

This does the exact same as #695 did, but for AppImages now.

I understand this PR introduces a lot of changes, and it's always annoying to review these. So, IMO simply running the resulting AppImages on your Linux distro and making sure they work is a good enough of a "review" for me...

Fixes #692

Fixes:

- Forward the $BUILD_DIR variable in $CMAKE_BUILD_OPTIONS.
- Add the forgotten '-n' command-line option in 'getopts'.
- Update the formatting used to document command-line options.
@guihkx
Copy link
Collaborator Author

guihkx commented Sep 12, 2024

I've tested the resulting AppImages using podman, on clean container images of two LTS versions of Ubuntu:

  • Ubuntu 20.04 (Qt 5 AppImage) (command used: podman run --rm -e APPIMAGE_EXTRACT_AND_RUN=1 -e DISPLAY -v $XAUTHORITY:/root/.Xauthority:ro -v /tmp/.X11-unix:/tmp/.X11-unix -v ./Notes_Qt5.AppImage:/Notes.AppImage ubuntu:20.04 bash -c 'apt-get update && apt-get install -y --no-install-recommends libfontconfig1 libgl1 libx11-6 libxcb1 && /Notes.AppImage')

    Screenshot

    image

  • Ubuntu 24.04 (Qt 6 AppImage) (command used: podman run --rm -e APPIMAGE_EXTRACT_AND_RUN=1 -e DISPLAY -e LANG=C.UTF-8 -v $XAUTHORITY:/root/.Xauthority:ro -v /tmp/.X11-unix:/tmp/.X11-unix -v ./Notes_Qt6.AppImage:/Notes.AppImage ubuntu:24.04 bash -c 'apt-get update && apt-get install -y --no-install-recommends libgl1 libegl1 libfontconfig1 libx11-6 && /Notes.AppImage')

    Screenshot

    image

I've also tested both AppImages on my Arch Linux machine, and they seem to work as expected.

This follows what was done in commit 51ba67b, but for AppImages.
@guihkx guihkx force-pushed the ci-linux-docker-publish-appimage branch from 8675539 to da974a8 Compare September 12, 2024 21:28
@nuttyartist
Copy link
Owner

I'll be testing this later today. 👍

@guihkx
Copy link
Collaborator Author

guihkx commented Sep 19, 2024

@nuttyartist Gentle ping.

Were you able to test this yet? I was hoping to merge this soon, so we can do a minor release to fix the broken AppImages of v2.3.0.

I have the work for the RPM packages ready as well. I'm just waiting for this to get merged first.

@nuttyartist
Copy link
Owner

Sorry about that! I’m currently on a holiday, so I’ll try to test it right after. If in your testing this seems to fix the issue then feel free to merge. Did I set you as a collaborator for the notes foss website repo? If so, you could update the links.

@guihkx
Copy link
Collaborator Author

guihkx commented Sep 20, 2024

Sorry about that! I’m currently on a holiday

That's no problem. :)

If in your testing this seems to fix the issue then feel free to merge.

It definitely does, but one extra confirmation is always good.

Did I set you as a collaborator for the notes foss website repo? If so, you could update the links.

I believe you did, yes.

Anyway, I think I'll wait a few more days for you to test this.

If you're still not able to until then, I'll merge this one and the next RPM pull request (I've also tested it). And after that, I'll prepare a new minor release.

Would that be acceptable for you?

@nuttyartist
Copy link
Owner

If in your testing this seems to fix the issue then feel free to merge.

I can test it in 5 days, if you don't mind waiting (I forgot my Linux USB stick at home, I believe).

@guihkx
Copy link
Collaborator Author

guihkx commented Sep 22, 2024

Sure, no problem.

@guihkx
Copy link
Collaborator Author

guihkx commented Sep 28, 2024

Gentle ping. Are you able to test this today? I want to hopefully merge this and the RPM pull request this weekend.

@nuttyartist
Copy link
Owner

Yes, thanks for reminding. I will test this today.

@nuttyartist
Copy link
Owner

nuttyartist commented Sep 29, 2024

Sorry about the long delay, seems to work fine on my Linux machine! Feel free to merge!

image

Copy link
Collaborator

@zjeffer zjeffer left a comment

Choose a reason for hiding this comment

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

Tested and works.
Still had to add -platform xcb to the commandline options because of #633, though. As Wayland is becoming the default on many desktop environments, that issue might get more attention.

LGTM, nice changes.

@guihkx
Copy link
Collaborator Author

guihkx commented Sep 29, 2024

Thank you both for testing!

@guihkx guihkx merged commit da974a8 into nuttyartist:master Sep 29, 2024
17 checks passed
@guihkx guihkx deleted the ci-linux-docker-publish-appimage branch September 29, 2024 12:23
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.

AppImages for v2.3.0 are broken
3 participants