diff --git a/.github/workflows/build-all.yaml b/.github/workflows/build-all.yaml index af26d4716..4d1d012fa 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: @@ -220,21 +220,21 @@ 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 - artifacts/oolite-windows-nsis-dev/OoliteInstall-*-dev.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 + - name: Remove old workflow runs if: github.ref == 'refs/heads/master' || endsWith(github.ref, 'maintenance') uses: Mattraks/delete-workflow-runs@v2 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 diff --git a/installers/appimage/create_appimage_fn.sh b/installers/appimage/create_appimage_fn.sh index 92a827287..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..c9f1bd68c 100755 --- a/installers/flatpak/create_flatpak_fn.sh +++ b/installers/flatpak/create_flatpak_fn.sh @@ -91,14 +91,9 @@ 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 arch=$(uname -m) + local suffix="-$ver_full-$build_type-$arch" + local filename="space.oolite.Oolite${suffix}.flatpak" echo "Creating Flatpak $filename..." if ! flatpak build-bundle \ repo \ @@ -107,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 \ 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