From 2edc165e268c6e37f9907d156ac0eeb90e679668 Mon Sep 17 00:00:00 2001 From: GreemDev Date: Mon, 13 Apr 2026 00:51:10 -0500 Subject: [PATCH] chore: post-migration cleanup --- .forgejo/workflows/canary.yml | 4 +- .forgejo/workflows/release.yml | 4 +- Ryujinx.sln | 6 +- assets/Locales/Root.json | 66 +++++++++--------- src/Ryujinx.Common/ReleaseInformation.cs | 4 +- src/Ryujinx.Common/SharedConstants.cs | 6 +- src/Ryujinx/Assets/UIImages/Logo_Forgejo.png | Bin 0 -> 1482 bytes .../Assets/UIImages/Logo_GitLab_Dark.png | Bin 4017 -> 0 bytes .../Assets/UIImages/Logo_GitLab_Light.png | Bin 5207 -> 0 bytes src/Ryujinx/Ryujinx.csproj | 3 +- src/Ryujinx/Systems/Updater/Updater.cs | 2 +- .../UI/ViewModels/AboutWindowViewModel.cs | 7 +- src/Ryujinx/UI/Views/Dialog/AboutView.axaml | 4 +- .../UI/Views/Main/MainMenuBarView.axaml | 6 +- 14 files changed, 57 insertions(+), 55 deletions(-) create mode 100644 src/Ryujinx/Assets/UIImages/Logo_Forgejo.png delete mode 100644 src/Ryujinx/Assets/UIImages/Logo_GitLab_Dark.png delete mode 100644 src/Ryujinx/Assets/UIImages/Logo_GitLab_Light.png diff --git a/.forgejo/workflows/canary.yml b/.forgejo/workflows/canary.yml index cd8f3aa1d..025dc2417 100644 --- a/.forgejo/workflows/canary.yml +++ b/.forgejo/workflows/canary.yml @@ -136,6 +136,7 @@ jobs: uses: actions/create-release@v1 with: name: "Canary ${{ steps.version_info.outputs.build_version }}" + body: "**Full Changelog:** [`${{ steps.version_info.outputs.prev_build_version }}...${{ steps.version_info.outputs.build_version }}`](https://git.ryujinx.app/projects/Ryubing/compare/Canary-${{ steps.version_info.outputs.prev_build_version }}...Canary-${{ steps.version_info.outputs.build_version }})" repository: "Ryubing/Canary" token: ${{ secrets.RELEASER_TOKEN }} tag_name: ${{ steps.version_info.outputs.build_version }} @@ -198,6 +199,7 @@ jobs: uses: actions/create-release@v1 with: name: "Canary ${{ steps.version_info.outputs.build_version }}" + body: "**Full Changelog:** [`${{ steps.version_info.outputs.prev_build_version }}...${{ steps.version_info.outputs.build_version }}`](https://git.ryujinx.app/projects/Ryubing/compare/Canary-${{ steps.version_info.outputs.prev_build_version }}...Canary-${{ steps.version_info.outputs.build_version }})" repository: "Ryubing/Canary" token: ${{ secrets.RELEASER_TOKEN }} tag_name: ${{ steps.version_info.outputs.build_version }} @@ -246,4 +248,4 @@ jobs: - name: Advance to the next version run: | - gli increment-version -T ${{ secrets.UPDATE_SERVER_ADMIN_TOKEN }} -c Canary \ No newline at end of file + gli increment-version -T ${{ secrets.UPDATE_SERVER_ADMIN_TOKEN }} -c Canary diff --git a/.forgejo/workflows/release.yml b/.forgejo/workflows/release.yml index ed9171f3d..c6da033b1 100644 --- a/.forgejo/workflows/release.yml +++ b/.forgejo/workflows/release.yml @@ -203,8 +203,8 @@ jobs: files: |- publish_ava/ryujinx-canary-${{ steps.version_info.outputs.build_version }}-macos_universal.app.tar.gz - create_gitlab_release: - name: Create GitLab Release + post_ci: + name: Post-CI Steps runs-on: ubuntu-24.04 needs: - macos_release diff --git a/Ryujinx.sln b/Ryujinx.sln index deddb97a0..26e96311e 100644 --- a/Ryujinx.sln +++ b/Ryujinx.sln @@ -86,11 +86,11 @@ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{36F870C1-3E5F-485F-B426-F0645AF78751}" ProjectSection(SolutionItems) = preProject .editorconfig = .editorconfig - .github\workflows\build.yml = .github\workflows\build.yml - .github\workflows\canary.yml = .github\workflows\canary.yml + .forgejo\workflows\build.yml = .forgejo\workflows\build.yml + .forgejo\workflows\canary.yml = .forgejo\workflows\canary.yml Directory.Packages.props = Directory.Packages.props Directory.Build.props = Directory.Build.props - .github\workflows\release.yml = .github\workflows\release.yml + .forgejo\workflows\release.yml = .forgejo\workflows\release.yml nuget.config = nuget.config EndProjectSection EndProject diff --git a/assets/Locales/Root.json b/assets/Locales/Root.json index a455a47da..5035d1552 100644 --- a/assets/Locales/Root.json +++ b/assets/Locales/Root.json @@ -15351,28 +15351,28 @@ } }, { - "ID": "AboutGitLabUrlTooltipMessage", + "ID": "AboutForgejoUrlTooltipMessage", "Translations": { "ar_SA": "انقر لفتح صفحة ريوجينكس في غيت هاب في متصفحك الافتراضي.", - "de_DE": "Klicke hier, um die Ryujinx GitLab Seite im Standardbrowser zu öffnen.", - "el_GR": "Κάντε κλικ για να ανοίξετε τη σελίδα Ryujinx GitLab στο προεπιλεγμένο πρόγραμμα περιήγησης.", - "en_US": "Click to open the Ryujinx GitLab page in your default browser.", - "es_ES": "Haz clic para abrir el GitLab de Ryujinx en tu navegador predeterminado.", - "fr_FR": "Cliquez pour ouvrir la page GitLab de Ryujinx dans votre navigateur par défaut.", + "de_DE": "Klicke hier, um die Ryujinx Forgejo Seite im Standardbrowser zu öffnen.", + "el_GR": "Κάντε κλικ για να ανοίξετε τη σελίδα Ryujinx Forgejo στο προεπιλεγμένο πρόγραμμα περιήγησης.", + "en_US": "Click to open the Ryujinx Forgejo page in your default browser.", + "es_ES": "Haz clic para abrir el Forgejo de Ryujinx en tu navegador predeterminado.", + "fr_FR": "Cliquez pour ouvrir la page Forgejo de Ryujinx dans votre navigateur par défaut.", "he_IL": "לחץ כדי לפתוח את דף הגיטהב של ריוג'ינקס בדפדפן ברירת המחדל שלך.", - "it_IT": "Clicca per aprire la pagina GitLab di Ryujinx nel tuo browser predefinito.", - "ja_JP": "クリックするとデフォルトのブラウザで Ryujinx の GitLab ページを開きます.", - "ko_KR": "클릭하면 기본 브라우저에서 Ryujinx GitLab 페이지가 열립니다.", - "no_NO": "Klikk for å åpne Ryujinx GitLab siden i din standardnettleser.", - "pl_PL": "Kliknij, aby otworzyć stronę GitLab Ryujinx w domyślnej przeglądarce.", - "pt_BR": "Clique para abrir a página do GitLab do Ryujinx no seu navegador padrão.", - "ru_RU": "Нажмите, чтобы открыть страницу Ryujinx на GitLab", - "sv_SE": "Klicka för att öppna Ryujinx GitLab-sida i din webbläsare.", - "th_TH": "คลิกเพื่อเปิดหน้า GitLab ของ Ryujinx บนเบราว์เซอร์เริ่มต้นของคุณ", - "tr_TR": "Ryujinx'in GitLab sayfasını varsayılan tarayıcınızda açmak için tıklayın.", - "uk_UA": "Натисніть, щоб відкрити сторінку GitLab Ryujinx у браузері.", - "zh_CN": "在浏览器中打开 Ryujinx 的 GitLab 代码库。", - "zh_TW": "在預設瀏覽器中開啟 Ryujinx 的 GitLab 網頁。" + "it_IT": "Clicca per aprire la pagina Forgejo di Ryujinx nel tuo browser predefinito.", + "ja_JP": "クリックするとデフォルトのブラウザで Ryujinx の Forgejo ページを開きます.", + "ko_KR": "클릭하면 기본 브라우저에서 Ryujinx Forgejo 페이지가 열립니다.", + "no_NO": "Klikk for å åpne Ryujinx Forgejo siden i din standardnettleser.", + "pl_PL": "Kliknij, aby otworzyć stronę Forgejo Ryujinx w domyślnej przeglądarce.", + "pt_BR": "Clique para abrir a página do Forgejo do Ryujinx no seu navegador padrão.", + "ru_RU": "Нажмите, чтобы открыть страницу Ryujinx на Forgejo", + "sv_SE": "Klicka för att öppna Ryujinx Forgejo-sida i din webbläsare.", + "th_TH": "คลิกเพื่อเปิดหน้า Forgejo ของ Ryujinx บนเบราว์เซอร์เริ่มต้นของคุณ", + "tr_TR": "Ryujinx'in Forgejo sayfasını varsayılan tarayıcınızda açmak için tıklayın.", + "uk_UA": "Натисніть, щоб відкрити сторінку Forgejo Ryujinx у браузері.", + "zh_CN": "在浏览器中打开 Ryujinx 的 Forgejo 代码库。", + "zh_TW": "在預設瀏覽器中開啟 Ryujinx 的 Forgejo 網頁。" } }, { @@ -15431,23 +15431,23 @@ "ar_SA": "", "de_DE": "", "el_GR": "", - "en_US": "Ryujinx is an emulator for the Nintendo Switch™ 1.\nGet all the latest news in our Discord.\nDevelopers interested in contributing can find out more on our GitLab or Discord.", - "es_ES": "Ryujinx es un emulador para Nintendo Switch™ 1.\nObtén todas las novedades en nuestro Discord.\nLos desarrolladores interesados en contribuir pueden obtener más información en nuestro GitLab o Discord.", - "fr_FR": "Ryujinx est un émulateur pour la Nintendo Switch™ 1.\nObtenez les dernières nouvelles sur notre Discord.\nLes développeurs souhaitant contribuer peuvent en savoir plus sur notre GitLab ou Discord.", + "en_US": "Ryujinx is an emulator for the Nintendo Switch™ 1.\nGet all the latest news in our Discord.\nDevelopers interested in contributing can find out more on our Forgejo or Discord.", + "es_ES": "Ryujinx es un emulador para Nintendo Switch™ 1.\nObtén todas las novedades en nuestro Discord.\nLos desarrolladores interesados en contribuir pueden obtener más información en nuestro Forgejo o Discord.", + "fr_FR": "Ryujinx est un émulateur pour la Nintendo Switch™ 1.\nObtenez les dernières nouvelles sur notre Discord.\nLes développeurs souhaitant contribuer peuvent en savoir plus sur notre Forgejo ou Discord.", "he_IL": "", - "it_IT": "Ryujinx è un emulatore della console Nintendo Switch™ 1.\nRimani aggiornato sulle ultime novità nel nostro server Discord.\nGli sviluppatori interessati a contribuire possono trovare maggiori informazioni su Discord o sulla nostra pagina GitLab.", + "it_IT": "Ryujinx è un emulatore della console Nintendo Switch™ 1.\nRimani aggiornato sulle ultime novità nel nostro server Discord.\nGli sviluppatori interessati a contribuire possono trovare maggiori informazioni su Discord o sulla nostra pagina Forgejo.", "ja_JP": "", - "ko_KR": "Ryujinx는 Nintendo Switch™ 1용 에뮬레이터입니다.\n모든 최신 소식을 Discord에서 확인하세요.\n기여에 관심이 있는 개발자는 GitLab 또는 Discord에서 자세한 내용을 확인할 수 있습니다.", - "no_NO": "Ryujinx er en emulator for Nintendo Switch™ 1\nVennligst støtt oss på Patreon.\nFå alle de siste nyhetene på vår Twitter eller Discord.\nUtviklere som er interessert i å bidra kan finne ut mer på GitLab eller Discord.", + "ko_KR": "Ryujinx는 Nintendo Switch™ 1용 에뮬레이터입니다.\n모든 최신 소식을 Discord에서 확인하세요.\n기여에 관심이 있는 개발자는 Forgejo 또는 Discord에서 자세한 내용을 확인할 수 있습니다.", + "no_NO": "Ryujinx er en emulator for Nintendo Switch™ 1\nVennligst støtt oss på Patreon.\nFå alle de siste nyhetene på vår Twitter eller Discord.\nUtviklere som er interessert i å bidra kan finne ut mer på Forgejo eller Discord.", "pl_PL": "", - "pt_BR": "Ryujinx é um emulador de Nintendo Switch™ 1.\nReceba todas as últimas notícias em nosso Discord.\nDesenvolvedores interessados em contribuir podem descobrir mais em nosso GitLab ou Discord.", - "ru_RU": "Ryujinx - это эмулятор для Nintendo Switch™ 1.\nПолучайте все последние новости разработки в нашем Discord.\nРазработчики, заинтересованные в участии, могут узнать больше на нашем GitLab или Discord.", - "sv_SE": "Ryujinx är en emulator för Nintendo Switch™ 1.\nFå de senaste nyheterna via vår Discord.\nUtvecklare som är intresserade att bidra kan hitta mer info på vår GitLab eller Discord.", - "th_TH": "Ryujinx เป็นโปรแกรมจำลองสำหรับเครื่อง Nintendo Switch™ 1\nติดตามข่าวสารล่าสุดได้ที่ Discord ของเรา\nนักพัฒนาที่สนใจร่วมพัฒนา สามารถดูข้อมูลเพิ่มเติมได้ทาง GitLab หรือ Discord", + "pt_BR": "Ryujinx é um emulador de Nintendo Switch™ 1.\nReceba todas as últimas notícias em nosso Discord.\nDesenvolvedores interessados em contribuir podem descobrir mais em nosso Forgejo ou Discord.", + "ru_RU": "Ryujinx - это эмулятор для Nintendo Switch™ 1.\nПолучайте все последние новости разработки в нашем Discord.\nРазработчики, заинтересованные в участии, могут узнать больше на нашем Forgejo или Discord.", + "sv_SE": "Ryujinx är en emulator för Nintendo Switch™ 1.\nFå de senaste nyheterna via vår Discord.\nUtvecklare som är intresserade att bidra kan hitta mer info på vår Forgejo eller Discord.", + "th_TH": "Ryujinx เป็นโปรแกรมจำลองสำหรับเครื่อง Nintendo Switch™ 1\nติดตามข่าวสารล่าสุดได้ที่ Discord ของเรา\nนักพัฒนาที่สนใจร่วมพัฒนา สามารถดูข้อมูลเพิ่มเติมได้ทาง Forgejo หรือ Discord", "tr_TR": "", - "uk_UA": "Ryujinx — це емулятор для Nintendo Switch™ 1.\nОстанні новини можна отримати в нашому Discord.\nРозробники, що бажають долучитись до розробки та зробити свій внесок, можуть отримати більше інформації на нашому GitLab або в Discord.", - "zh_CN": "Ryujinx 是一个 Nintendo Switch™ 1 模拟器。\n有兴趣做出贡献的开发者可以在我们的 GitLab 或 Discord 上了解更多信息。\n", - "zh_TW": "Ryujinx 是一款 Nintendo Switch™ 1 模擬器。\n關注我們的 Discord 取得所有最新消息。\n對於有興趣貢獻的開發者，可以在我們的 GitLab 或 Discord 上了解更多資訊。" + "uk_UA": "Ryujinx — це емулятор для Nintendo Switch™ 1.\nОстанні новини можна отримати в нашому Discord.\nРозробники, що бажають долучитись до розробки та зробити свій внесок, можуть отримати більше інформації на нашому Forgejo або в Discord.", + "zh_CN": "Ryujinx 是一个 Nintendo Switch™ 1 模拟器。\n有兴趣做出贡献的开发者可以在我们的 Forgejo 或 Discord 上了解更多信息。\n", + "zh_TW": "Ryujinx 是一款 Nintendo Switch™ 1 模擬器。\n關注我們的 Discord 取得所有最新消息。\n對於有興趣貢獻的開發者，可以在我們的 Forgejo 或 Discord 上了解更多資訊。" } }, { @@ -24901,4 +24901,4 @@ } } ] -} \ No newline at end of file +} diff --git a/src/Ryujinx.Common/ReleaseInformation.cs b/src/Ryujinx.Common/ReleaseInformation.cs index 530dc369e..54525278b 100644 --- a/src/Ryujinx.Common/ReleaseInformation.cs +++ b/src/Ryujinx.Common/ReleaseInformation.cs @@ -29,8 +29,8 @@ namespace Ryujinx.Common public static string GetChangelogUrl(Version currentVersion, Version newVersion) => IsCanaryBuild - ? $"https://git.ryujinx.app/ryubing/ryujinx/-/compare/Canary-{currentVersion}...Canary-{newVersion}" - : $"https://git.ryujinx.app/ryubing/ryujinx/-/releases/{newVersion}"; + ? $"https://git.ryujinx.app/projects/Ryubing/compare/Canary-{currentVersion}...Canary-{newVersion}" + : $"https://git.ryujinx.app/projects/Ryubing/releases/tag/{newVersion}"; } diff --git a/src/Ryujinx.Common/SharedConstants.cs b/src/Ryujinx.Common/SharedConstants.cs index 53b6f1350..2c79c3478 100644 --- a/src/Ryujinx.Common/SharedConstants.cs +++ b/src/Ryujinx.Common/SharedConstants.cs @@ -8,12 +8,12 @@ namespace Ryujinx.Common public const string AmiiboTagsUrl = "https://raw.githubusercontent.com/Ryubing/Nfc/refs/heads/main/tags.json"; - public const string FaqWikiUrl = "https://git.ryujinx.app/ryubing/ryujinx/-/wikis/FAQ-&-Troubleshooting"; + public const string FaqWikiUrl = "https://git.ryujinx.app/projects/Ryubing/wiki/FAQ-%26-Troubleshooting"; public const string SetupGuideWikiUrl = - "https://git.ryujinx.app/ryubing/ryujinx/-/wikis/Setup-&-Configuration-Guide"; + "https://git.ryujinx.app/projects/Ryubing/wiki/Setup-%26-Configuration-Guide"; public const string MultiplayerWikiUrl = - "https://git.ryujinx.app/ryubing/ryujinx/-/wikis/Multiplayer-(LDN-Local-Wireless)-Guide"; + "https://git.ryujinx.app/projects/Ryubing/wiki/Multiplayer-(LDN-Local-Wireless)-Guide"; } } diff --git a/src/Ryujinx/Assets/UIImages/Logo_Forgejo.png b/src/Ryujinx/Assets/UIImages/Logo_Forgejo.png new file mode 100644 index 0000000000000000000000000000000000000000..de736c6215371e92faedeb9761a3b349b11d9cf0 GIT binary patch literal 1482 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 diff --git a/src/Ryujinx/Assets/UIImages/Logo_GitLab_Light.png b/src/Ryujinx/Assets/UIImages/Logo_GitLab_Light.png deleted file mode 100644 index 17a4feefb8c53239d54807e76c1ec7ddcf31e91f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5207 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 - - + diff --git a/src/Ryujinx/Systems/Updater/Updater.cs b/src/Ryujinx/Systems/Updater/Updater.cs index bc45f8ff6..ac168eb03 100644 --- a/src/Ryujinx/Systems/Updater/Updater.cs +++ b/src/Ryujinx/Systems/Updater/Updater.cs @@ -79,7 +79,7 @@ namespace Ryujinx.Ava.Systems { buildSizeClient.DefaultRequestHeaders.Add("Range", "bytes=0-0"); - // GitLab instance is located in Ukraine. Connection times will vary across the world. + // Forgejo instance is located in Ukraine. Connection times will vary across the world. buildSizeClient.Timeout = TimeSpan.FromSeconds(10); HttpResponseMessage message = await buildSizeClient.GetAsync(new Uri(_versionResponse.ArtifactUrl), HttpCompletionOption.ResponseHeadersRead); diff --git a/src/Ryujinx/UI/ViewModels/AboutWindowViewModel.cs b/src/Ryujinx/UI/ViewModels/AboutWindowViewModel.cs index 47a99d886..b5cff424a 100644 --- a/src/Ryujinx/UI/ViewModels/AboutWindowViewModel.cs +++ b/src/Ryujinx/UI/ViewModels/AboutWindowViewModel.cs @@ -11,7 +11,7 @@ namespace Ryujinx.Ava.UI.ViewModels { public partial class AboutWindowViewModel : BaseModel, IDisposable { - [ObservableProperty] public partial Bitmap GitLabLogo { get; set; } + [ObservableProperty] public partial Bitmap ForgejoLogo { get; set; } [ObservableProperty] public partial Bitmap DiscordLogo { get; set; } @@ -37,6 +37,7 @@ namespace Ryujinx.Ava.UI.ViewModels } private const string LogoPathFormat = "resm:Ryujinx.Assets.UIImages.Logo_{0}_{1}.png?assembly=Ryujinx"; + private const string UnthemedLogoPathFormat = "resm:Ryujinx.Assets.UIImages.Logo_{0}.png?assembly=Ryujinx"; private void UpdateLogoTheme(string theme) { @@ -46,7 +47,7 @@ namespace Ryujinx.Ava.UI.ViewModels string themeName = isDarkTheme ? "Dark" : "Light"; DiscordLogo = LoadBitmap(LogoPathFormat.Format("Discord", themeName)); - GitLabLogo = LoadBitmap(LogoPathFormat.Format("GitLab", themeName)); + ForgejoLogo = LoadBitmap(UnthemedLogoPathFormat.Format("Forgejo")); } private static Bitmap LoadBitmap(string uri) => new(Avalonia.Platform.AssetLoader.Open(new Uri(uri))); @@ -55,7 +56,7 @@ namespace Ryujinx.Ava.UI.ViewModels { RyujinxApp.ThemeChanged -= Ryujinx_ThemeChanged; - GitLabLogo.Dispose(); + ForgejoLogo.Dispose(); DiscordLogo.Dispose(); GC.SuppressFinalize(this); diff --git a/src/Ryujinx/UI/Views/Dialog/AboutView.axaml b/src/Ryujinx/UI/Views/Dialog/AboutView.axaml index 5700de6b9..d2f6284a2 100644 --- a/src/Ryujinx/UI/Views/Dialog/AboutView.axaml +++ b/src/Ryujinx/UI/Views/Dialog/AboutView.axaml @@ -122,8 +122,8 @@ Click="Button_OnClick" CornerRadius="15" Tag="https://src.ryujinx.app" - ToolTip.Tip="{ext:Locale AboutGitLabUrlTooltipMessage}"> - + ToolTip.Tip="{ext:Locale AboutForgejoUrlTooltipMessage}"> +