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

Next TFE release with support for mods #11

Open
wants to merge 2 commits into
base: master
Choose a base branch
from

Conversation

JakeSmarter
Copy link
Contributor

@JakeSmarter JakeSmarter commented Mar 11, 2024

@flathubbot
Copy link
Contributor

Started test build 106315

@flathubbot
Copy link
Contributor

Build 106315 failed

@JakeSmarter
Copy link
Contributor Author

FYI: the build check fails as expected because the tfe module does not source commits since v1.09.540.

@flathubbot
Copy link
Contributor

Started test build 106996

@flathubbot
Copy link
Contributor

Build 106996 failed

@flathubbot
Copy link
Contributor

Started test build 106998

@flathubbot
Copy link
Contributor

Build 106998 failed

@flathubbot
Copy link
Contributor

Started test build 107008

@flathubbot
Copy link
Contributor

Build 107008 failed

@flathubbot
Copy link
Contributor

Started test build 114115

@flathubbot
Copy link
Contributor

Build 114115 failed

@flathubbot
Copy link
Contributor

Started test build 114116

@flathubbot
Copy link
Contributor

Build 114116 failed

@flathubbot
Copy link
Contributor

Started test build 172831

@flathubbot
Copy link
Contributor

Build 172831 failed

@fpiesche
Copy link
Collaborator

fpiesche commented Jan 8, 2025

Could you resolve the conflicts above so we can hopefully merge this?

@JakeSmarter
Copy link
Contributor Author

@fpiesche Sure, I have been waiting for this. 🥳 I have already installed and tested a handful of custom missions locally. They work surprisingly well. So, please give me a day or so. Thank you.

@flathubbot
Copy link
Contributor

Started test build 174772

@flathubbot
Copy link
Contributor

Build 174772 failed

@fpiesche
Copy link
Collaborator

/bin/sh: line 1: appstream-compose: command not found

excuse?

@fpiesche
Copy link
Collaborator

bot, build io.github.theforceengine.tfe

@flathubbot
Copy link
Contributor

Queued test build for io.github.theforceengine.tfe.

@flathubbot
Copy link
Contributor

Started test build 174800

@flathubbot
Copy link
Contributor

Build 174800 failed

@fpiesche
Copy link
Collaborator

@JakeSmarter is the appstream-compose step there actually necessary for anything? I've tried removing the entire post-install segment locally and it builds fine like that but I'm not sure if that makes the mod function...?

@JakeSmarter
Copy link
Contributor Author

Apparently appstream-compose has been dropped from 24.08 for some unknown reason. 🙁 It is needed to add the default AdjustableHud mod to the AppStream catalog, so that AdjustableHud mod appears nicely and is separately manageable in app portals. Let me see whether I can replace what appstream-compose is doing with appstreamcli compose.

@fpiesche
Copy link
Collaborator

From what I can see even without that step, the metainfo just gets exported automatically:

 outrider@ash  ~/Development/io.github.theforceengine.tfe   mods_extension ●  flatpak-builder build --force-clean ./io.github.theforceengine.tfe.yml
Emptying app dir 'build'
Downloading sources
Fetching git repo https://github.com/luciusDXL/TheForceEngine.git, ref refs/tags/v1.10.000
remote: Total 0 (delta 0), reused 0 (delta 0), pack-reused 0 (from 0)
Starting build of io.github.theforceengine.tfe
Cache hit for glu, skipping build
Cache hit for glew, skipping build
Cache hit for tfe, skipping build
Cache hit for launch_script, skipping build
Cache hit for cleanup, skipping
Cache miss, checking out last cache hit
Finishing app
Exporting share/applications/io.github.theforceengine.tfe.desktop
Exporting share/icons/hicolor/256x256/apps/io.github.theforceengine.tfe.png
Exporting share/metainfo/io.github.theforceengine.tfe.Mod.AdjustableHud.metainfo.xml
Exporting share/metainfo/io.github.theforceengine.tfe.metainfo.xml
Please review the exported files and the metadata
Committing stage finish to cache
Pruning cache

@JakeSmarter
Copy link
Contributor Author

From what I can see even without that step, the metainfo just gets exported automatically

Yeah, maybe flatpak-builder has been finally updated/fixed to properly handle AppStream metadata of extensions. If so we can drop that manual appstream-compose step.

@JakeSmarter
Copy link
Contributor Author

JakeSmarter commented Jan 17, 2025

Just tried it. 😞 Nop, flatpak-builder continues to not handle AppStream metadata of built‑in extensions properly. Let me workaround it with appstreamcli compose.

@flathubbot
Copy link
Contributor

Started test build 175254

@flathubbot
Copy link
Contributor

Build 175254 successful
To test this build, install it from the testing repository:

flatpak install --user https://dl.flathub.org/build-repo/158392/io.github.theforceengine.tfe.flatpakref

@JakeSmarter
Copy link
Contributor Author

JakeSmarter commented Jan 18, 2025

🎉 It works!

So, I investigated a little bit why appstream-compose has been dropped from org.freedesktop.Sdk. It turns out, it is currently under some massive makeover. I am guessing this is why it has been dropped from org.freedesktop.Sdk. I was not aware that appstream-compose was a libappstream-glib tool. Flatpak itself uses appstream compose internally. So, I think we are on the right track and good to go. 👍

@flathubbot
Copy link
Contributor

Started test build 175342

@flathubbot
Copy link
Contributor

Build 175342 successful
To test this build, install it from the testing repository:

flatpak install --user https://dl.flathub.org/build-repo/158484/io.github.theforceengine.tfe.flatpakref

@flathubbot
Copy link
Contributor

Started test build 175464

@flathubbot
Copy link
Contributor

Build 175464 successful
To test this build, install it from the testing repository:

flatpak install --user https://dl.flathub.org/build-repo/158608/io.github.theforceengine.tfe.flatpakref

Externalize launch script into a separate file
Enable Wayland support following luciusDXL/TheForceEngine#386
Move installing the launch script into a separate `module`
Use Flatpak Builder environment variables where applicable
Fix git tag pattern checker
Change `buildsystem` to `cmake`
Add Flatpak extension support for mods following luciusDXL/TheForceEngine#393
Externalize the default “AdjustableHud” mod into a separate but bundled Flatpak `.Mod` extension
@flathubbot
Copy link
Contributor

Started test build 175480

@flathubbot
Copy link
Contributor

Build 175480 successful
To test this build, install it from the testing repository:

flatpak install --user https://dl.flathub.org/build-repo/158624/io.github.theforceengine.tfe.flatpakref

@fpiesche
Copy link
Collaborator

bot, build io.github.theforceengine.tfe

@flathubbot
Copy link
Contributor

Queued test build for io.github.theforceengine.tfe.

@flathubbot
Copy link
Contributor

Started test build 176358

@flathubbot
Copy link
Contributor

Build 176358 successful
To test this build, install it from the testing repository:

flatpak install --user https://dl.flathub.org/build-repo/159507/io.github.theforceengine.tfe.flatpakref

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