Combined freedesktop build step and metadata for AppImageHub and FlatHub

.github/workflows/build-all.yaml

@@ -96,7 +96,7 @@ jobs:
         with:
           name: oolite-linux-${{matrix.flavour}}
           path: |
-            oolite/build/Oolite_*.AppImage
+            oolite/build/oolite*.AppImage
           retention-days: 5
 
   build-flatpak:
@@ -341,7 +341,7 @@ jobs:
           echo "OOLITE_VERSION=${OOLITE_VERSION}" >> "$GITHUB_OUTPUT"
 
       - name: Remove old prereleases
-        if: github.ref == 'refs/heads/master'
+        if: github.ref == 'refs/heads/master' || endsWith(github.ref, 'maintenance')
         uses: s00d/delete-older-releases@0.2.1
         with:
           keep_latest: 7
@@ -352,7 +352,7 @@ jobs:
       # For changes on master branch, create a new release.
       # It should move the 'latest' tag automatically.
       - name: Create Release
-        if: github.ref == 'refs/heads/master'
+        if: github.ref == 'refs/heads/master' || endsWith(github.ref, 'maintenance')
         id: create_release
         uses: "marvinpinto/action-automatic-releases@latest"
         with:
@@ -372,7 +372,7 @@ jobs:
             artifacts/oolite-flatpak/*.flatpak
 
       - name: Remove old workflow runs
-        if: github.ref == 'refs/heads/master'
+        if: github.ref == 'refs/heads/master' || endsWith(github.ref, 'maintenance')
         uses: Mattraks/delete-workflow-runs@v2
         with:
           token: ${{ github.token }}
@@ -386,7 +386,7 @@ jobs:
       url: ${{ steps.deployment.outputs.page_url }}
     needs: build-doxygen
     runs-on: ubuntu-22.04
-    if: github.ref == 'refs/heads/master'
+    if: github.ref == 'refs/heads/master' || endsWith(github.ref, 'maintenance')
 
     # Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
     permissions:

.github/workflows/test_builds.yaml

@@ -38,10 +38,10 @@ jobs:
         run: |
           dnf -y update
           dnf -y install git
-      - uses: actions/checkout@v6
-        with:
-          fetch-depth: 0
-          submodules: true
+      - name: Checkout Oolite
+        run: |
+          git config --global --add safe.directory "$GITHUB_WORKSPACE"
+          git clone --recursive https://github.com/${{ github.repository }} .
       - name: Checkout dependencies
         run: |
           ShellScripts/Linux/checkout_deps.sh
@@ -65,10 +65,10 @@ jobs:
         run: |
           pacman -Syu --noconfirm
           pacman -S --noconfirm --needed git
-      - uses: actions/checkout@v6
-        with:
-          fetch-depth: 0
-          submodules: true
+      - name: Checkout Oolite
+        run: |
+          git config --global --add safe.directory "$GITHUB_WORKSPACE"
+          git clone --recursive https://github.com/${{ github.repository }} .
       - name: Checkout dependencies
         run: |
           ShellScripts/Linux/checkout_deps.sh

ShellScripts/Linux/checkout_deps_fn.sh

@@ -11,5 +11,6 @@ checkout_deps() {
     git clone --filter=blob:none https://github.com/gnustep/libobjc2.git
     git clone --filter=blob:none https://github.com/gnustep/tools-make.git
     git clone --filter=blob:none https://github.com/gnustep/libs-base.git
+
     popd
 }

ShellScripts/Linux/install_deps_root.sh

@@ -78,10 +78,7 @@ run_script() {
         return 1
     fi
     # For building AppImage
-    if ! install_package file; then
-        return 1
-    fi
-    if ! install_package fuse; then
+    if ! install_package appimage; then
         return 1
     fi
     # For building Flatpak
@@ -116,7 +113,6 @@ run_script() {
     cd tools-make
     make clean
 
-    # Bash
     if [[ ${CURRENT_DISTRO,,} == "redhat" ]]; then
         LIB_PARAM="--with-libdir=lib64"
     else

ShellScripts/Linux/install_freedesktop_fn.sh

@@ -0,0 +1,44 @@
+#!/bin/bash
+
+install_freedesktop() {
+    # Install metainfo (eg. for FlatHub and AppImageHub)
+    # $1: app folder (destination)
+    # $2: appdata or metainfo
+
+    local err_msg="❌ Error: Failed to install "
+
+    SCRIPT_DIR=$(cd "$(dirname "${BASH_SOURCE[0]}")" &> /dev/null && pwd)
+    pushd "$SCRIPT_DIR"
+
+    source ../common/get_version.sh
+
+    echo "Installing metainfo to to $1"
+
+    PROGDIR="../../oolite.app"
+    APPBIN="$1/bin"
+    APPSHR="$1/share"
+
+    # Install binaries and scripts
+    install -D "$PROGDIR/oolite" "$APPBIN/oolite" || { echo "$err_msg oolite binary" >&2; return 1; }
+    install -D "$PROGDIR/run_oolite.sh" "$APPBIN/run_oolite.sh" || { echo "$err_msg run_oolite.sh" >&2; return 1; }
+    install -D "$PROGDIR/splash-launcher" "$APPBIN/splash-launcher" || { echo "$err_msg splash-launcher" >&2; return 1; }
+
+    # Resources copy
+    mkdir -p "$APPBIN/Resources"
+    cp -rf "$PROGDIR/Resources/." "$APPBIN/Resources/" || { echo "$err_msg Copying Resources folder" >&2; return 1; }
+
+    install -D "GNUstep.conf.template" "$APPBIN/Resources/GNUstep.conf.template" || { echo "$err_msg GNUstep template" >&2; return 1; }
+
+    APP_METAINFO="$APPSHR/metainfo/space.oolite.Oolite.$2.xml"
+    install -D ../../installers/FreeDesktop/space.oolite.Oolite.metainfo.xml.template "$APP_METAINFO" || { echo "$err_msg metainfo template" >&2; return 1; }
+
+    sed -i "s/@VER@/${VERSION}/g" "$APP_METAINFO"
+    sed -i "s/@DATE@/${APP_DATE}/g" "$APP_METAINFO"
+
+    # Desktop and Icon
+    install -D ../../installers/FreeDesktop/space.oolite.Oolite.desktop "$APPSHR/applications/space.oolite.Oolite.desktop" || { echo "$err_msg desktop file" >&2; return 1; }
+
+    install -D "$PROGDIR/Resources/Textures/oolite-logo1.png" "$APPSHR/icons/hicolor/256x256/apps/space.oolite.Oolite.png" || { echo "$err_msg icon file" >&2; return 1; }
+
+    popd
+}

ShellScripts/Linux/install_package_fn.sh

@@ -128,9 +128,12 @@ install_package() {
                 arch) PKG_NAME="libx11" ;;
             esac ;;
 
-        "file") PKG_NAME="file" ;;
-
-        "fuse") PKG_NAME="fuse3" ;;
+        "appimage")
+            case "$CURRENT_DISTRO" in
+                debian) PKG_NAME="file fuse3" ;;
+                redhat) PKG_NAME="file fuse3 which desktop-file-utils perl-File-MimeInfo" ;;
+                arch) PKG_NAME="file fuse3" ;;
+            esac ;;
 
         "flatpak") PKG_NAME="flatpak flatpak-builder" ;;
 

ShellScripts/common/checkout_submodules.sh

@@ -5,7 +5,7 @@ run_script() {
     pushd "$SCRIPT_DIR"
 
     source ./checkout_submodules_fn.sh
-    cd ../..
+
     if ! checkout_submodules; then
         return 1
     fi

ShellScripts/common/get_version.sh

@@ -13,7 +13,15 @@ VER_REV=$(echo "$VERSION" | cut -d. -f3)
 if [ "" == "$VER_REV" ]; then
     VER_REV="0"
 fi
-VER_DATE=$(date +%y%m%d)
+TIMESTAMP=$(git log -1 --format=%ct)
+# Date conversions use UTC for consistency
+# Convert to __DATE__ format (e.g., Feb 20 2026)
+CPP_DATE=$(date -u -d "@$TIMESTAMP" +"%b %e %Y")
+# Convert to YYYY-MM-DD
+APP_DATE=$(date -u -d "@$TIMESTAMP" +"%Y-%m-%d")
+# Convert to YYMMDD format (e.g., 260313)
+VER_DATE=$(date -u -d "@$TIMESTAMP" +"%y%m%d")
+
 VER_GITREV=$(git rev-list --count HEAD)
 VER_GITHASH=$(git rev-parse --short=7 HEAD)
 VER_FULL="$VER_MAJ.$VER_MIN.$VER_REV.$VER_GITREV-$VER_DATE-$VER_GITHASH"

installers/FreeDesktop/oolite.desktop → installers/FreeDesktop/space.oolite.Oolite.desktop

@@ -1,8 +1,8 @@
 [Desktop Entry]
-Name=Oolite
+Name=oolite
 Comment=An OpenGL Elite-like space game
-Exec=oolite
-Icon=oolite-icon
+Exec=run_oolite.sh
+Icon=space.oolite.Oolite
 Terminal=false
 Type=Application
 Categories=Game;Simulation;

installers/flatpak/space.oolite.Oolite.metainfo.xml → installers/FreeDesktop/space.oolite.Oolite.metainfo.xml.template

@@ -44,31 +44,46 @@
 
   <screenshots>
     <screenshot type="default">
-      <image>https://raw.githubusercontent.com/OoliteProject/oolite/1.92-maintenance/installers/flatpak/oolite-999.png</image>
+      <image>https://raw.githubusercontent.com/OoliteProject/oolite/1.92-maintenance/installers/FreeDesktop/oolite-999.png</image>
       <caption>The universe awaits. Go explore and seek your fortune!</caption>
     </screenshot>
     <screenshot>
-      <image>https://raw.githubusercontent.com/OoliteProject/oolite/1.92-maintenance/installers/flatpak/oolite-008.png</image>
+      <image>https://raw.githubusercontent.com/OoliteProject/oolite/1.92-maintenance/installers/FreeDesktop/oolite-008.png</image>
       <caption>Choose from a diverse range of interstellar craft. </caption>
     </screenshot>
     <screenshot>
-      <image>https://raw.githubusercontent.com/OoliteProject/oolite/1.92-maintenance/installers/flatpak/oolite-064.png</image>
+      <image>https://raw.githubusercontent.com/OoliteProject/oolite/1.92-maintenance/installers/FreeDesktop/oolite-064.png</image>
       <caption>Find safety in massive orbital stations.</caption>
     </screenshot>
     <screenshot>
-      <image>https://raw.githubusercontent.com/OoliteProject/oolite/1.92-maintenance/installers/flatpak/oolite-001.png</image>
+      <image>https://raw.githubusercontent.com/OoliteProject/oolite/1.92-maintenance/installers/FreeDesktop/oolite-001.png</image>
       <caption>Access the expansion pack manager and quick reference guides on the start screen.</caption>
     </screenshot>
     <screenshot>
-      <image>https://raw.githubusercontent.com/OoliteProject/oolite/1.92-maintenance/installers/flatpak/oolite-002.png</image>
+      <image>https://raw.githubusercontent.com/OoliteProject/oolite/1.92-maintenance/installers/FreeDesktop/oolite-002.png</image>
       <caption>Learn to fly with the tutorial covering piloting, combat, and travel.</caption>
     </screenshot>
     <screenshot>
-      <image>https://raw.githubusercontent.com/OoliteProject/oolite/1.92-maintenance/installers/flatpak/oolite-004.png</image>
+      <image>https://raw.githubusercontent.com/OoliteProject/oolite/1.92-maintenance/installers/FreeDesktop/oolite-004.png</image>
       <caption>Fly to Maraus, a wealthy industrial world, one of 2000 systems to be discovered.</caption>
     </screenshot>
   </screenshots>
 
   <releases>
+    <release version="@VER@" date="@DATE@">
+      <description>
+        <p>This stable release fixes these bugs:</p>
+        <ul>
+          <li>Centre main window after showing splash.</li>
+          <li>Smooth resizing of game window.</li>
+          <li>Fix for crash when no network.</li>
+        </ul>
+      </description>
+    </release>
+    <release version="1.92" date="2026-02-03">
+      <description>
+        <p>First release of Oolite for Flatpak and AppImage.</p>
+      </description>
+    </release>
   </releases>
 </component>