Merge branch 'Master_PR' into 'master'

Improved interaction with "Input" settings. See merge request ryubing/ryujinx!4
UI: Forgot to restore the updater in one place
2025-04-21 18:13:14 +02:00 · 2025-03-19 00:38:53 +00:00 · 2025-03-18 19:07:22 -05:00 · 2025-03-18 18:58:52 -05:00 · 2025-03-18 18:46:22 -05:00 · 2025-03-18 18:40:58 -05:00
5 changed files with 45 additions and 17 deletions
--- a/.github/workflows/canary.yml
+++ b/.github/workflows/canary.yml
@ -36,8 +36,20 @@ jobs:
        run: |
          echo "build_version=${{ env.RYUJINX_BASE_VERSION }}.${{ github.run_number }}" >> $GITHUB_OUTPUT
          echo "prev_build_version=${{ env.RYUJINX_BASE_VERSION }}.$((${{ github.run_number }} - 1))" >> $GITHUB_OUTPUT
-          echo "git_hash=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
        shell: bash
+        
+      - name: Install GitLabCli
+        run: |
+          mkdir -p $HOME/.bin
+          gh release download -R GreemDev/GLI -O gli -p 'GitLabCli-linux_x64'
+          chmod +x gli
+          mv gli $HOME/.bin/
+          echo "$HOME/.bin" >> $GITHUB_PATH
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          
+      - name: Create GitLab tag
+        run: gli --access-token=${{ secrets.GITLAB_TOKEN }} --project=ryubing/ryujinx --command=CreateTag "Canary-${{ steps.version_info.outputs.build_version }}|master"

      - name: Create release
        uses: ncipollo/release-action@v1
@ -57,7 +69,7 @@ jobs:
            | Linux ARM 64-bit | [Canary Linux ARM Artifact](https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-linux_arm64.tar.gz) |
            | macOS | [Canary macOS Artifact](https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-macos_universal.app.tar.gz) |
            
-            **[Full Changelog](https://git.ryujinx.app/ryubing/ryujinx/-/commit/${{ steps.version_info.outputs.git_hash }})**
+            **[Full Changelog](https://git.ryujinx.app/ryubing/ryujinx/-/compare/Canary-${{ steps.version_info.outputs.prev_build_version }}...Canary-${{ steps.version_info.outputs.build_version }})**
          omitBodyDuringUpdate: true
          owner: ${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}
          repo: ${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}
@ -89,7 +101,6 @@ jobs:
          echo "build_version=${{ env.RYUJINX_BASE_VERSION }}.${{ github.run_number }}" >> $GITHUB_OUTPUT
          echo "prev_build_version=${{ env.RYUJINX_BASE_VERSION }}.$((${{ github.run_number }} - 1))" >> $GITHUB_OUTPUT
          echo "git_short_hash=$(git rev-parse --short "${{ github.sha }}")" >> $GITHUB_OUTPUT
-          echo "git_hash=$(git rev-parse HEAD)" >> $GITHUB_OUTPUT
        shell: bash

      - name: Configure for release
@ -185,8 +196,8 @@ jobs:
            | Linux 64-bit | [Canary Linux Artifact](https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-linux_x64.tar.gz) |
            | Linux ARM 64-bit | [Canary Linux ARM Artifact](https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-linux_arm64.tar.gz) |
            | macOS | [Canary macOS Artifact](https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-macos_universal.app.tar.gz) |
-          
-            **[Full Changelog](https://git.ryujinx.app/ryubing/ryujinx/-/commit/${{ steps.version_info.outputs.git_hash }})**
+            
+            **[Full Changelog](https://git.ryujinx.app/ryubing/ryujinx/-/compare/Canary-${{ steps.version_info.outputs.prev_build_version }}...Canary-${{ steps.version_info.outputs.build_version }})**
          omitBodyDuringUpdate: true
          allowUpdates: true
          replacesArtifacts: true
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@ -27,6 +27,19 @@ jobs:
          echo "build_version=${{ env.RYUJINX_BASE_VERSION }}.${{ github.run_number }}" >> $GITHUB_OUTPUT
          echo "prev_build_version=${{ env.RYUJINX_BASE_VERSION }}.$((${{ github.run_number }} - 1))" >> $GITHUB_OUTPUT
        shell: bash
+        
+      - name: Install GitLabCli
+        run: |
+          mkdir -p $HOME/.bin
+          gh release download -R GreemDev/GLI -O gli -p 'GitLabCli-linux_x64'
+          chmod +x gli
+          mv gli $HOME/.bin/
+          echo "$HOME/.bin" >> $GITHUB_PATH
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Create GitLab tag
+        run: gli --access-token=${{ secrets.GITLAB_TOKEN }} --project=ryubing/ryujinx --command=CreateTag "${{ steps.version_info.outputs.build_version }}|master"

      - name: Create release
        uses: ncipollo/release-action@v1
@ -42,6 +55,8 @@ jobs:
            | Linux 64-bit | [Stable Linux Artifact](https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-${{ steps.version_info.outputs.build_version }}-linux_x64.tar.gz) |
            | Linux ARM 64-bit | [Stable Linux ARM Artifact](https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-${{ steps.version_info.outputs.build_version }}-linux_arm64.tar.gz) |
            | macOS | [Stable macOS Artifact](https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-${{ steps.version_info.outputs.build_version }}-macos_universal.app.tar.gz) |
+            
+            **[Full Changelog](https://git.ryujinx.app/ryubing/ryujinx/-/compare/${{ steps.version_info.outputs.prev_build_version }}...${{ steps.version_info.outputs.build_version }})**
          omitBodyDuringUpdate: true
          owner: ${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}
          repo: ${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}
@ -164,6 +179,8 @@ jobs:
            | Linux 64-bit | [Stable Linux Artifact](https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-${{ steps.version_info.outputs.build_version }}-linux_x64.tar.gz) |
            | Linux ARM 64-bit | [Stable Linux ARM Artifact](https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-${{ steps.version_info.outputs.build_version }}-linux_arm64.tar.gz) |
            | macOS | [Stable macOS Artifact](https://github.com/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/releases/download/${{ steps.version_info.outputs.build_version }}/ryujinx-${{ steps.version_info.outputs.build_version }}-macos_universal.app.tar.gz) |
+            
+            **[Full Changelog](https://git.ryujinx.app/ryubing/ryujinx/-/compare/${{ steps.version_info.outputs.prev_build_version }}...${{ steps.version_info.outputs.build_version }})**
          omitBodyDuringUpdate: true
          allowUpdates: true
          replacesArtifacts: true
--- a/src/Ryujinx.Common/ReleaseInformation.cs
+++ b/src/Ryujinx.Common/ReleaseInformation.cs
@ -40,7 +40,7 @@ namespace Ryujinx.Common

        public static string GetChangelogUrl(Version currentVersion, Version newVersion, ReleaseChannels.Channel releaseChannel) =>
            IsCanaryBuild 
-                ? $"https://github.com/{ReleaseChannelOwner}/{ReleaseChannelSourceRepo}/compare/Canary-{currentVersion}...Canary-{newVersion}" 
+                ? $"https://git.ryujinx.app/ryubing/ryujinx/-/compare/Canary-{currentVersion}...Canary-{newVersion}"
                : GetChangelogForVersion(newVersion, releaseChannel);
        
        public static string GetChangelogForVersion(Version version, ReleaseChannels.Channel releaseChannel) =>
--- a/src/Ryujinx/Systems/Updater.cs
+++ b/src/Ryujinx/Systems/Updater.cs
@ -103,10 +103,10 @@ namespace Ryujinx.Ava.Systems
                                    LocaleManager.Instance[LocaleKeys.DialogUpdaterAlreadyOnLatestVersionMessage],
                                    string.Empty);

-                                /*if (userResult is UserResult.Ok)
+                                if (userResult is UserResult.Ok)
                                {
-                                    OpenHelper.OpenUrl(ReleaseInformation.GetChangelogForVersion(currentVersion));
-                                }*/
+                                    OpenHelper.OpenUrl(ReleaseInformation.GetChangelogForVersion(currentVersion, _currentReleaseChannel.Value));
+                                }
                            }
                            
                            Logger.Info?.Print(LogClass.Application, "Up to date.");
@ -193,10 +193,10 @@ namespace Ryujinx.Ava.Systems
                        LocaleManager.Instance[LocaleKeys.DialogUpdaterAlreadyOnLatestVersionMessage],
                        string.Empty);

-                    /*if (userResult is UserResult.Ok)
+                    if (userResult is UserResult.Ok)
                    {
-                        OpenHelper.OpenUrl(ReleaseInformation.GetChangelogForVersion(currentVersion));
-                    }*/
+                        OpenHelper.OpenUrl(ReleaseInformation.GetChangelogForVersion(currentVersion, _currentReleaseChannel.Value));
+                    }
                }
                
                Logger.Info?.Print(LogClass.Application, "Up to date.");
@ -232,7 +232,7 @@ namespace Ryujinx.Ava.Systems
                
                Logger.Info?.Print(LogClass.Application, $"Version found: {newVersionString}");
                
-            //RequestUserToUpdate:
+            RequestUserToUpdate:
                // Show a message asking the user if they want to update
                UserResult shouldUpdate = await ContentDialogHelper.CreateUpdaterChoiceDialog(
                    LocaleManager.Instance[LocaleKeys.RyujinxUpdater],
@ -245,9 +245,9 @@ namespace Ryujinx.Ava.Systems
                        await UpdateRyujinx(_buildUrl);
                        break;
                    // Secondary button maps to no, which in this case is the show changelog button.
-                    /*case UserResult.No:
-                        OpenHelper.OpenUrl(ReleaseInformation.GetChangelogUrl(currentVersion, newVersion));
-                        goto RequestUserToUpdate;*/
+                    case UserResult.No:
+                        OpenHelper.OpenUrl(ReleaseInformation.GetChangelogUrl(currentVersion, newVersion, _currentReleaseChannel.Value));
+                        goto RequestUserToUpdate;
                    default:
                        _running = false;
                        break;
--- a/src/Ryujinx/UI/Helpers/ContentDialogHelper.cs
+++ b/src/Ryujinx/UI/Helpers/ContentDialogHelper.cs
@ -354,7 +354,7 @@ namespace Ryujinx.Ava.UI.Helpers
                primary,
                secondaryText,
                LocaleManager.Instance[LocaleKeys.InputDialogYes],
-                string.Empty, // LocaleManager.Instance[LocaleKeys.DialogUpdaterShowChangelogMessage],
+                LocaleManager.Instance[LocaleKeys.DialogUpdaterShowChangelogMessage],
                LocaleManager.Instance[LocaleKeys.InputDialogNo],
                (int)Symbol.Help,
                UserResult.Yes);
Author	SHA1	Message	Date
Goodfeat	553ffc13d9	Merge branch 'Master_PR' into 'master' Improved interaction with "Input" settings. See merge request ryubing/ryujinx!4	2025-03-19 00:38:53 +00:00
GreemDev	c229d458e7	UI: Forgot to restore the updater in one place I knew something was missing	2025-03-18 19:07:22 -05:00
GreemDev	f09ca0f57f	UI: Restore in-app changelog functionality	2025-03-18 18:58:52 -05:00
GreemDev	f2c5cf8a60	Add gitlab tag creation to stable releases	2025-03-18 18:46:22 -05:00
GreemDev	9742a78c06	attempt 2: give gli execute permission in CI	2025-03-18 18:40:58 -05:00
GreemDev	cb33e2c13f	Attempt 1 at bringing back Canary changelogs (and Full Changelog at the end of releases)	2025-03-18 18:36:09 -05:00