From 90813cf150e9995464d141b4bf3df464de62b9b9 Mon Sep 17 00:00:00 2001 From: mcarans Date: Fri, 17 Jul 2026 10:13:41 +1200 Subject: [PATCH 1/9] Install procps (for ps command) --- ShellScripts/Linux/install_package_fn.sh | 7 ++++++- ShellScripts/Linux/install_packages_root.sh | 3 +++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/ShellScripts/Linux/install_package_fn.sh b/ShellScripts/Linux/install_package_fn.sh index 476ad8a43..389da4f15 100644 --- a/ShellScripts/Linux/install_package_fn.sh +++ b/ShellScripts/Linux/install_package_fn.sh @@ -10,7 +10,12 @@ install_package() { # This CASE statement is the dictionary. # Add your packages here. case "$generic_name" in - "git") pkg_name="git" ;; + "procps") + case "$CURRENT_DISTRO" in + debian) pkg_name="procps" ;; + redhat) pkg_name="procps-ng" ;; + arch) pkg_name="procps-ng" ;; + esac ;; "base-devel") case "$CURRENT_DISTRO" in diff --git a/ShellScripts/Linux/install_packages_root.sh b/ShellScripts/Linux/install_packages_root.sh index ddd9a31a5..6f2274931 100755 --- a/ShellScripts/Linux/install_packages_root.sh +++ b/ShellScripts/Linux/install_packages_root.sh @@ -17,6 +17,9 @@ run_script() { source install_gitversion_fn.sh source install_package_fn.sh + if ! install_package procps; then + return 1 + fi if ! install_package base-devel; then return 1 fi From 753dcfdbe110732ff1e62dad4b65d4e7433b708b Mon Sep 17 00:00:00 2001 From: mcarans Date: Fri, 17 Jul 2026 10:55:45 +1200 Subject: [PATCH 2/9] Replace deprecated GH Action --- .github/workflows/build-all.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/build-all.yaml b/.github/workflows/build-all.yaml index af26d4716..87f48b697 100644 --- a/.github/workflows/build-all.yaml +++ b/.github/workflows/build-all.yaml @@ -220,13 +220,12 @@ jobs: # It should move the 'latest' tag automatically. - name: Create Release id: create_release - uses: "marvinpinto/action-automatic-releases@latest" + uses: softprops/action-gh-release@v3 with: - repo_token: "${{ secrets.GITHUB_TOKEN }}" - # automatic_release_tag: "latest" - automatic_release_tag: "${{ steps.version.outputs.VER_FULL }}" + token: "${{ secrets.GITHUB_TOKEN }}" + name: "Oolite ${{ steps.version.outputs.VER_FULL }}" + tag_name: "${{ steps.version.outputs.VER_FULL }}" prerelease: true - title: "Oolite ${{ steps.version.outputs.VER_FULL }}" files: | artifacts/oolite-windows-nsis-deployment/OoliteInstall-*.exe artifacts/oolite-windows-nsis-test/OoliteInstall-*.exe @@ -235,6 +234,7 @@ jobs: artifacts/oolite-linux-appimage-test/*.AppImage artifacts/oolite-linux-appimage-dev/*.AppImage artifacts/oolite-linux-flatpak-deployment/*.flatpak + - name: Remove old workflow runs if: github.ref == 'refs/heads/master' || endsWith(github.ref, 'maintenance') uses: Mattraks/delete-workflow-runs@v2 From 505edb83d010e5f3ebe43b739447628379188e21 Mon Sep 17 00:00:00 2001 From: mcarans Date: Fri, 17 Jul 2026 13:00:00 +1200 Subject: [PATCH 3/9] Capitalise AppImage name to fix release order --- .github/workflows/build-all.yaml | 2 +- installers/appimage/create_appimage_fn.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-all.yaml b/.github/workflows/build-all.yaml index 87f48b697..ad65a21fb 100644 --- a/.github/workflows/build-all.yaml +++ b/.github/workflows/build-all.yaml @@ -67,7 +67,7 @@ jobs: with: name: oolite-linux-appimage-${{matrix.flavour}} path: | - build/oolite*.AppImage + build/Oolite*.AppImage retention-days: 5 build-flatpak: diff --git a/installers/appimage/create_appimage_fn.sh b/installers/appimage/create_appimage_fn.sh index 92a827287..e41635779 100755 --- a/installers/appimage/create_appimage_fn.sh +++ b/installers/appimage/create_appimage_fn.sh @@ -41,7 +41,7 @@ create_appimage() { else suffix="-$ver_full" fi - local OUTNAME="oolite${suffix}-${arch}.AppImage" + local OUTNAME="Oolite${suffix}-${arch}.AppImage" export OUTNAME echo "Building AppDir for AppImage..." From 3eecbd087c6b2a806c60e497b620b2bebaf82e5f Mon Sep 17 00:00:00 2001 From: mcarans Date: Fri, 17 Jul 2026 13:24:04 +1200 Subject: [PATCH 4/9] Try preserve_order --- .github/workflows/build-all.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build-all.yaml b/.github/workflows/build-all.yaml index ad65a21fb..3aacbf17b 100644 --- a/.github/workflows/build-all.yaml +++ b/.github/workflows/build-all.yaml @@ -226,6 +226,7 @@ jobs: name: "Oolite ${{ steps.version.outputs.VER_FULL }}" tag_name: "${{ steps.version.outputs.VER_FULL }}" prerelease: true + preserve_order: true files: | artifacts/oolite-windows-nsis-deployment/OoliteInstall-*.exe artifacts/oolite-windows-nsis-test/OoliteInstall-*.exe From 6227c3741a0a3afa9cb048c2bf8463d850f526ac Mon Sep 17 00:00:00 2001 From: mcarans Date: Fri, 17 Jul 2026 13:40:39 +1200 Subject: [PATCH 5/9] Try uploading appimage first --- .github/workflows/build-all.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build-all.yaml b/.github/workflows/build-all.yaml index 3aacbf17b..374d8fb5d 100644 --- a/.github/workflows/build-all.yaml +++ b/.github/workflows/build-all.yaml @@ -228,13 +228,13 @@ jobs: prerelease: true preserve_order: true files: | - artifacts/oolite-windows-nsis-deployment/OoliteInstall-*.exe - artifacts/oolite-windows-nsis-test/OoliteInstall-*.exe - artifacts/oolite-windows-nsis-dev/OoliteInstall-*-dev.exe artifacts/oolite-linux-appimage-deployment/*.AppImage artifacts/oolite-linux-appimage-test/*.AppImage artifacts/oolite-linux-appimage-dev/*.AppImage artifacts/oolite-linux-flatpak-deployment/*.flatpak + artifacts/oolite-windows-nsis-deployment/OoliteInstall-*.exe + artifacts/oolite-windows-nsis-test/OoliteInstall-*.exe + artifacts/oolite-windows-nsis-dev/OoliteInstall-*-dev.exe - name: Remove old workflow runs if: github.ref == 'refs/heads/master' || endsWith(github.ref, 'maintenance') From 0c79d15533ab601120c30fb49996a49cbf2feab6 Mon Sep 17 00:00:00 2001 From: mcarans Date: Fri, 17 Jul 2026 14:00:39 +1200 Subject: [PATCH 6/9] Naming is alphabetical - fix deployment name --- .github/workflows/build-all.yaml | 7 +++---- installers/appimage/create_appimage_fn.sh | 8 +------- installers/flatpak/create_flatpak_fn.sh | 8 +------- installers/win32/OOlite.nsi | 2 +- 4 files changed, 6 insertions(+), 19 deletions(-) diff --git a/.github/workflows/build-all.yaml b/.github/workflows/build-all.yaml index 374d8fb5d..4d1d012fa 100644 --- a/.github/workflows/build-all.yaml +++ b/.github/workflows/build-all.yaml @@ -226,15 +226,14 @@ jobs: name: "Oolite ${{ steps.version.outputs.VER_FULL }}" tag_name: "${{ steps.version.outputs.VER_FULL }}" prerelease: true - preserve_order: true files: | + artifacts/oolite-windows-nsis-deployment/OoliteInstall-*.exe + artifacts/oolite-windows-nsis-test/OoliteInstall-*.exe + artifacts/oolite-windows-nsis-dev/OoliteInstall-*.exe artifacts/oolite-linux-appimage-deployment/*.AppImage artifacts/oolite-linux-appimage-test/*.AppImage artifacts/oolite-linux-appimage-dev/*.AppImage artifacts/oolite-linux-flatpak-deployment/*.flatpak - artifacts/oolite-windows-nsis-deployment/OoliteInstall-*.exe - artifacts/oolite-windows-nsis-test/OoliteInstall-*.exe - artifacts/oolite-windows-nsis-dev/OoliteInstall-*-dev.exe - name: Remove old workflow runs if: github.ref == 'refs/heads/master' || endsWith(github.ref, 'maintenance') diff --git a/installers/appimage/create_appimage_fn.sh b/installers/appimage/create_appimage_fn.sh index e41635779..d5ea52315 100755 --- a/installers/appimage/create_appimage_fn.sh +++ b/installers/appimage/create_appimage_fn.sh @@ -35,13 +35,7 @@ create_appimage() { export ICON local DESKTOP="$appshr/applications/space.oolite.Oolite.desktop" export DESKTOP - local suffix - if [[ "$build_type" != "deployment" ]]; then - suffix="_$build_type-$ver_full" - else - suffix="-$ver_full" - fi - local OUTNAME="Oolite${suffix}-${arch}.AppImage" + local OUTNAME="Oolite-$ver_full-$build_type-$arch.AppImage" export OUTNAME echo "Building AppDir for AppImage..." diff --git a/installers/flatpak/create_flatpak_fn.sh b/installers/flatpak/create_flatpak_fn.sh index 0ce28358a..fd50a73cc 100755 --- a/installers/flatpak/create_flatpak_fn.sh +++ b/installers/flatpak/create_flatpak_fn.sh @@ -91,14 +91,8 @@ create_flatpak() { return 1 fi - local suffix - if [[ "$build_type" != "deployment" ]]; then - suffix="_$build_type-$ver_full" - else - suffix="-$ver_full" - fi local ARCH=$(uname -m) - local filename="space.oolite.Oolite${suffix}-${ARCH}.flatpak" + local filename="space.oolite.Oolite-$ver_full-$build_type-$ARCH.flatpak" echo "Creating Flatpak $filename..." if ! flatpak build-bundle \ repo \ diff --git a/installers/win32/OOlite.nsi b/installers/win32/OOlite.nsi index 9f0f0cd8c..7d025e16e 100644 --- a/installers/win32/OOlite.nsi +++ b/installers/win32/OOlite.nsi @@ -36,7 +36,7 @@ !define EXTVER "-test" ; Official distribution with OXP developer tools !define ADDCHANGELOG 1 ; Official distributions go with a changelog file !else -!define EXTVER "" +!define EXTVER "-deployment" !define ADDCHANGELOG 1 ; Official distributions go with a changelog file !endif !else From 29745caa7506fcf373d9c48ce7fce908f31e9983 Mon Sep 17 00:00:00 2001 From: mcarans Date: Fri, 17 Jul 2026 14:07:24 +1200 Subject: [PATCH 7/9] Fix naming to meet flatpak convention --- installers/appimage/create_appimage_fn.sh | 2 +- installers/flatpak/create_flatpak_fn.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/installers/appimage/create_appimage_fn.sh b/installers/appimage/create_appimage_fn.sh index d5ea52315..c27a88f2e 100755 --- a/installers/appimage/create_appimage_fn.sh +++ b/installers/appimage/create_appimage_fn.sh @@ -35,7 +35,7 @@ create_appimage() { export ICON local DESKTOP="$appshr/applications/space.oolite.Oolite.desktop" export DESKTOP - local OUTNAME="Oolite-$ver_full-$build_type-$arch.AppImage" + local OUTNAME="Oolite_$arch_$ver_full-$build_type.AppImage" export OUTNAME echo "Building AppDir for AppImage..." diff --git a/installers/flatpak/create_flatpak_fn.sh b/installers/flatpak/create_flatpak_fn.sh index fd50a73cc..8ebd57ddd 100755 --- a/installers/flatpak/create_flatpak_fn.sh +++ b/installers/flatpak/create_flatpak_fn.sh @@ -91,8 +91,8 @@ create_flatpak() { return 1 fi - local ARCH=$(uname -m) - local filename="space.oolite.Oolite-$ver_full-$build_type-$ARCH.flatpak" + local arch=$(uname -m) + local filename="space.oolite.Oolite_$arch_$ver_full-$build_type.flatpak" echo "Creating Flatpak $filename..." if ! flatpak build-bundle \ repo \ From ed57cfc6884659aa20528a13f2104cd1c506262d Mon Sep 17 00:00:00 2001 From: mcarans Date: Fri, 17 Jul 2026 14:38:43 +1200 Subject: [PATCH 8/9] Fix naming to meet appimage and flatpak conventions --- installers/appimage/create_appimage_fn.sh | 2 +- installers/flatpak/create_flatpak_fn.sh | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/installers/appimage/create_appimage_fn.sh b/installers/appimage/create_appimage_fn.sh index c27a88f2e..d5ea52315 100755 --- a/installers/appimage/create_appimage_fn.sh +++ b/installers/appimage/create_appimage_fn.sh @@ -35,7 +35,7 @@ create_appimage() { export ICON local DESKTOP="$appshr/applications/space.oolite.Oolite.desktop" export DESKTOP - local OUTNAME="Oolite_$arch_$ver_full-$build_type.AppImage" + local OUTNAME="Oolite-$ver_full-$build_type-$arch.AppImage" export OUTNAME echo "Building AppDir for AppImage..." diff --git a/installers/flatpak/create_flatpak_fn.sh b/installers/flatpak/create_flatpak_fn.sh index 8ebd57ddd..ff13cd956 100755 --- a/installers/flatpak/create_flatpak_fn.sh +++ b/installers/flatpak/create_flatpak_fn.sh @@ -92,7 +92,8 @@ create_flatpak() { fi local arch=$(uname -m) - local filename="space.oolite.Oolite_$arch_$ver_full-$build_type.flatpak" + local suffix="-$arch-$ver_full-$build_type" + local filename="space.oolite.Oolite${suffix}.flatpak" echo "Creating Flatpak $filename..." if ! flatpak build-bundle \ repo \ @@ -101,7 +102,7 @@ create_flatpak() { echo "❌ Flatpak bundle creation failed!" >&2 return 1 fi - local debugname="space.oolite.Oolite.Debug${suffix}-${ARCH}.flatpak" + local debugname="space.oolite.Oolite.Debug${suffix}.flatpak" if ! flatpak build-bundle \ --runtime \ repo \ From 9e2550ea593eab2709e50a7df1fd6e171736bc52 Mon Sep 17 00:00:00 2001 From: mcarans Date: Fri, 17 Jul 2026 15:17:47 +1200 Subject: [PATCH 9/9] Fix naming --- installers/flatpak/create_flatpak_fn.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/installers/flatpak/create_flatpak_fn.sh b/installers/flatpak/create_flatpak_fn.sh index ff13cd956..c9f1bd68c 100755 --- a/installers/flatpak/create_flatpak_fn.sh +++ b/installers/flatpak/create_flatpak_fn.sh @@ -92,7 +92,7 @@ create_flatpak() { fi local arch=$(uname -m) - local suffix="-$arch-$ver_full-$build_type" + local suffix="-$ver_full-$build_type-$arch" local filename="space.oolite.Oolite${suffix}.flatpak" echo "Creating Flatpak $filename..." if ! flatpak build-bundle \