infra: Add AppImage build to release workflow (Enjoy Steam Deck users 🙂)

.github/ISSUE_TEMPLATE/config.yml

@@ -1,5 +1,5 @@
 blank_issues_enabled: true
 contact_links:
-  - name: ryujinx-mirror (Discord)
-    url: https://discord.gg/xmHPGDfVCa
+  - name: Latte Softworks Discord
+    url: https://latte.to/discord
     about: This is the home of development for the ryujinx-mirror fork, feel free to make a post in `#ryujinx-help` for general support & technical issues

.github/workflows/build.yml

@@ -93,19 +93,15 @@ jobs:
           wget -q -O tools/appimagetool "https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-x86_64.AppImage"
           chmod +x tools/appimagetool
 
-          # Explicitly set $ARCH for appimagetool ($ARCH_NAME is for the file name)
           if [ "$PLATFORM_NAME" = "linux-x64" ]; then
-            ARCH_NAME=x64
             export ARCH=x86_64
           elif [ "$PLATFORM_NAME" = "linux-arm64" ]; then
-            ARCH_NAME=arm64
             export ARCH=aarch64
           else
             echo "Unexpected PLATFORM_NAME "$PLATFORM_NAME""
             exit 1
           fi
 
-          export UFLAG="gh-releases-zsync|${{ github.repository_owner }}|${{ github.event.repository.name }}|latest|*-$ARCH_NAME.AppImage.zsync"
           BUILDDIR=publish OUTDIR=publish_appimage distribution/linux/appimage/build-appimage.sh
         shell: bash
 

.github/workflows/release.yml

@@ -106,24 +106,20 @@ jobs:
       - name: Packing Windows builds
         if: matrix.platform.os == 'windows-latest'
         run: |
-          BUILD_VERSION="${{ steps.version_info.outputs.build_version }}"
-          ZIP_OS_NAME="${{ matrix.platform.zip_os_name }}"
-
           pushd publish_ava
           cp Ryujinx.exe Ryujinx.Ava.exe
-          7z a ../release_output/ryujinx-$BUILD_VERSION-$ZIP_OS_NAME.zip *
-          7z a ../release_output/test-ava-ryujinx-$BUILD_VERSION-$ZIP_OS_NAME.zip *
+          7z a ../release_output/ryujinx-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.zip *
+          7z a ../release_output/test-ava-ryujinx-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.zip *
           popd
 
           pushd publish_sdl2_headless
-          7z a ../release_output/sdl2-ryujinx-headless-$BUILD_VERSION-$ZIP_OS_NAME.zip *
+          7z a ../release_output/sdl2-ryujinx-headless-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.zip *
           popd
         shell: bash
 
       - name: Build AppImage (Linux)
         if: matrix.platform.os == 'ubuntu-latest'
         run: |
-          BUILD_VERSION="${{ steps.version_info.outputs.build_version }}"
           PLATFORM_NAME="${{ matrix.platform.name }}"
 
           sudo apt install -y zsync desktop-file-utils appstream
@@ -135,44 +131,36 @@ jobs:
           wget -q -O tools/appimagetool "https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-x86_64.AppImage"
           chmod +x tools/appimagetool
 
-          # Explicitly set $ARCH for appimagetool ($ARCH_NAME is for the file name)
           if [ "$PLATFORM_NAME" = "linux-x64" ]; then
-            ARCH_NAME=x64
             export ARCH=x86_64
           elif [ "$PLATFORM_NAME" = "linux-arm64" ]; then
-            ARCH_NAME=arm64
             export ARCH=aarch64
           else
             echo "Unexpected PLATFORM_NAME "$PLATFORM_NAME""
             exit 1
           fi
 
-          export UFLAG="gh-releases-zsync|${{ github.repository_owner }}|${{ github.event.repository.name }}|latest|*-$ARCH_NAME.AppImage.zsync"
           BUILDDIR=publish_ava OUTDIR=publish_ava_appimage distribution/linux/appimage/build-appimage.sh
-
-          # Add to release output
-          pushd publish_ava_appimage
-          mv Ryujinx.AppImage ../release_output/ryujinx-$BUILD_VERSION-$ARCH_NAME.AppImage
-          mv Ryujinx.AppImage.zsync ../release_output/ryujinx-$BUILD_VERSION-$ARCH_NAME.AppImage.zsync
-          popd
         shell: bash
 
       - name: Packing Linux builds
         if: matrix.platform.os == 'ubuntu-latest'
         run: |
-          BUILD_VERSION="${{ steps.version_info.outputs.build_version }}"
-          ZIP_OS_NAME="${{ matrix.platform.zip_os_name }}"
-
           pushd publish_ava
           cp Ryujinx Ryujinx.Ava
           chmod +x Ryujinx.sh Ryujinx Ryujinx.Ava
-          tar -czvf ../release_output/ryujinx-$BUILD_VERSION-$ZIP_OS_NAME.tar.gz *
-          tar -czvf ../release_output/test-ava-ryujinx-$BUILD_VERSION-$ZIP_OS_NAME.tar.gz *
+          tar -czvf ../release_output/ryujinx-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.tar.gz *
+          tar -czvf ../release_output/test-ava-ryujinx-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.tar.gz *
           popd
 
           pushd publish_sdl2_headless
           chmod +x Ryujinx.sh Ryujinx.Headless.SDL2
-          tar -czvf ../release_output/sdl2-ryujinx-headless-$BUILD_VERSION-$ZIP_OS_NAME.tar.gz *
+          tar -czvf ../release_output/sdl2-ryujinx-headless-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}.tar.gz *
+          popd
+
+          # AppImage archive
+          pushd publish_ava_appimage
+          tar -czvf ../release_output/ryujinx-${{ steps.version_info.outputs.build_version }}-${{ matrix.platform.zip_os_name }}-AppImage.tar.gz *
           popd
         shell: bash
 
@@ -181,7 +169,7 @@ jobs:
         with:
           name: ${{ steps.version_info.outputs.build_version }}
           tag: ${{ steps.version_info.outputs.build_version }}
-          artifacts: "release_output/*.tar.gz,release_output/*.zip,release_output/*AppImage*"
+          artifacts: "release_output/*.tar.gz,release_output/*.zip"
           draft: "true"
           omitBody: true
           #omitBodyDuringUpdate: true

Directory.Packages.props

@@ -20,7 +20,7 @@
     <PackageVersion Include="LibHac" Version="0.19.0" />
     <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.4" />
     <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.9.2" />
-    <PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.1.1" />
+    <PackageVersion Include="Microsoft.IdentityModel.JsonWebTokens" Version="8.0.1" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
     <PackageVersion Include="Microsoft.IO.RecyclableMemoryStream" Version="3.0.1" />
     <PackageVersion Include="MsgPack.Cli" Version="1.0.1" />

distribution/linux/appimage/build-appimage.sh

@@ -1,16 +1,16 @@
 #!/bin/sh
-set -eu
+set -e
 
 ROOTDIR="$(readlink -f "$(dirname "$0")")"/../../../
 cd "$ROOTDIR"
 
 BUILDDIR=${BUILDDIR:-publish}
 OUTDIR=${OUTDIR:-publish_appimage}
-UFLAG=${UFLAG:-"gh-releases-zsync|ryujinx-mirror|ryujinx|latest|*-x64.AppImage.zsync"}
 
 rm -rf AppDir
-mkdir -p AppDir/usr/bin
+mkdir -p AppDir/usr/bin/bin
 
+# Add symlinks for the AppImage
 cp distribution/linux/Ryujinx.desktop AppDir/Ryujinx.desktop
 cp distribution/linux/appimage/AppRun AppDir/AppRun
 cp distribution/misc/Logo.svg AppDir/Ryujinx.svg
@@ -23,8 +23,8 @@ chmod +x AppDir/AppRun AppDir/usr/bin/Ryujinx*
 mkdir -p "$OUTDIR"
 
 appimagetool --comp zstd --mksquashfs-opt -Xcompression-level --mksquashfs-opt 21 \
-    -u "$UFLAG" \
+    -u "gh-releases-zsync|$GITHUB_REPOSITORY_OWNER|Ryujinx|latest|*.AppImage.zsync" \
     AppDir "$OUTDIR"/Ryujinx.AppImage
 
-# Move zsync file needed for delta updates
+# ??
 mv ./*.AppImage.zsync "$OUTDIR"

src/Ryujinx.Input.SDL2/SDL2Gamepad.cs

@@ -313,32 +313,6 @@ namespace Ryujinx.Input.SDL2
             return value * ConvertRate;
         }
 
-        private JoyconConfigControllerStick<GamepadInputId, Common.Configuration.Hid.Controller.StickInputId> GetLogicalJoyStickConfig(StickInputId inputId)
-        {
-            switch (inputId)
-            {
-                case StickInputId.Left:
-                    if (_configuration.RightJoyconStick.Joystick == Common.Configuration.Hid.Controller.StickInputId.Left)
-                    {
-                        return _configuration.RightJoyconStick;
-                    }
-                    else
-                    {
-                        return _configuration.LeftJoyconStick;
-                    }
-                case StickInputId.Right:
-                    if (_configuration.LeftJoyconStick.Joystick == Common.Configuration.Hid.Controller.StickInputId.Right)
-                    {
-                        return _configuration.LeftJoyconStick;
-                    }
-                    else
-                    {
-                        return _configuration.RightJoyconStick;
-                    }
-            }
-
-            return null;
-        }
         public (float, float) GetStick(StickInputId inputId)
         {
             if (inputId == StickInputId.Unbound)
@@ -369,26 +343,24 @@ namespace Ryujinx.Input.SDL2
 
             if (HasConfiguration)
             {
-                var joyconStickConfig = GetLogicalJoyStickConfig(inputId);
-
-                if (joyconStickConfig != null)
+                if ((inputId == StickInputId.Left && _configuration.LeftJoyconStick.InvertStickX) ||
+                    (inputId == StickInputId.Right && _configuration.RightJoyconStick.InvertStickX))
                 {
-                    if (joyconStickConfig.InvertStickX)
-                    {
-                        resultX = -resultX;
-                    }
+                    resultX = -resultX;
+                }
 
-                    if (joyconStickConfig.InvertStickY)
-                    {
-                        resultY = -resultY;
-                    }
+                if ((inputId == StickInputId.Left && _configuration.LeftJoyconStick.InvertStickY) ||
+                    (inputId == StickInputId.Right && _configuration.RightJoyconStick.InvertStickY))
+                {
+                    resultY = -resultY;
+                }
 
-                    if (joyconStickConfig.Rotate90CW)
-                    {
-                        float temp = resultX;
-                        resultX = resultY;
-                        resultY = -temp;
-                    }
+                if ((inputId == StickInputId.Left && _configuration.LeftJoyconStick.Rotate90CW) ||
+                    (inputId == StickInputId.Right && _configuration.RightJoyconStick.Rotate90CW))
+                {
+                    float temp = resultX;
+                    resultX = resultY;
+                    resultY = -temp;
                 }
             }
 

src/Ryujinx/UI/ViewModels/Input/InputViewModel.cs

@@ -45,6 +45,7 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
 
         private PlayerIndex _playerId;
         private int _controller;
+        private int _controllerNumber;
         private string _controllerImage;
         private int _device;
         private object _configViewModel;
@@ -438,24 +439,6 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
 
         public void LoadDevices()
         {
-            string GetGamepadName(IGamepad gamepad, int controllerNumber)
-            {
-                return $"{GetShortGamepadName(gamepad.Name)} ({controllerNumber})";
-            }
-
-            string GetUniqueGamepadName(IGamepad gamepad, ref int controllerNumber)
-            {
-                string name = GetGamepadName(gamepad, controllerNumber);
-
-                if (Devices.Any(controller => controller.Name == name))
-                {
-                    controllerNumber++;
-                    name = GetGamepadName(gamepad, controllerNumber);
-                }
-
-                return name;
-            }
-
             lock (Devices)
             {
                 Devices.Clear();
@@ -472,18 +455,23 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
                     }
                 }
 
-                int controllerNumber = 0;
                 foreach (string id in _mainWindow.InputManager.GamepadDriver.GamepadsIds)
                 {
                     using IGamepad gamepad = _mainWindow.InputManager.GamepadDriver.GetGamepad(id);
 
                     if (gamepad != null)
                     {
-                        string name = GetUniqueGamepadName(gamepad, ref controllerNumber);
-                        Devices.Add((DeviceType.Controller, id, name));
+                        if (Devices.Any(controller => GetShortGamepadId(controller.Id) == GetShortGamepadId(gamepad.Id)))
+                        {
+                            _controllerNumber++;
+                        }
+
+                        Devices.Add((DeviceType.Controller, id, $"{GetShortGamepadName(gamepad.Name)} ({_controllerNumber})"));
                     }
                 }
 
+                _controllerNumber = 0;
+
                 DeviceList.AddRange(Devices.Select(x => x.Name));
                 Device = Math.Min(Device, DeviceList.Count);
             }
@@ -697,7 +685,7 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
 
                 if (!File.Exists(path))
                 {
-                    int index = ProfilesList.IndexOf(ProfileName);
+                    var index = ProfilesList.IndexOf(ProfileName);
                     if (index != -1)
                     {
                         ProfilesList.RemoveAt(index);