From 59490d54b5e6b85df27ac6f6c08d0925be899360 Mon Sep 17 00:00:00 2001 From: Mary Date: Wed, 1 Jun 2022 02:01:16 +0200 Subject: [PATCH] infra: Switch to win10-x64 RID and fix PR comment for Avalonia and SDL2 artifact rename (#3375) * infra: Switch to win10-x64 RID and fix PR comment for Avalonia and SDL2 artifact rename * Address gdkchan's comments --- .github/workflows/build.yml | 2 +- .github/workflows/nightly_pr_comment.yml | 7 ++++++- .github/workflows/release.yml | 6 +++--- .../Ryujinx.Audio.Backends.SoundIo.csproj | 6 +++--- Ryujinx.Ava/Ryujinx.Ava.csproj | 2 +- Ryujinx.Headless.SDL2/Ryujinx.Headless.SDL2.csproj | 2 +- Ryujinx.ShaderTools/Ryujinx.ShaderTools.csproj | 1 - Ryujinx.Tests/Ryujinx.Tests.csproj | 1 - Ryujinx/Ryujinx.csproj | 2 +- 9 files changed, 16 insertions(+), 13 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 566b2f96e..d0bc13055 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -39,7 +39,7 @@ jobs: - os: windows-latest OS_NAME: Windows x64 - DOTNET_RUNTIME_IDENTIFIER: win-x64 + DOTNET_RUNTIME_IDENTIFIER: win10-x64 RELEASE_ZIP_OS_NAME: win_x64 fail-fast: false diff --git a/.github/workflows/nightly_pr_comment.yml b/.github/workflows/nightly_pr_comment.yml index 36a12ea90..0ab77b178 100644 --- a/.github/workflows/nightly_pr_comment.yml +++ b/.github/workflows/nightly_pr_comment.yml @@ -36,19 +36,24 @@ jobs: return core.error(`No artifacts found`); } let body = `Download the artifacts for this pull request:\n`; + let hidden_avalonia_artifacts = `\n\n
Experimental GUI (Avalonia)\n`; let hidden_headless_artifacts = `\n\n
GUI-less (SDL2)\n`; let hidden_debug_artifacts = `\n\n
Only for Developers\n`; for (const art of artifacts) { if(art.name.includes('Debug')) { hidden_debug_artifacts += `\n* [${art.name}](https://nightly.link/${owner}/${repo}/actions/artifacts/${art.id}.zip)`; - } else if(art.name.includes('headless-sdl2')) { + } else if(art.name.includes('ava-ryujinx')) { + hidden_avalonia_artifacts += `\n* [${art.name}](https://nightly.link/${owner}/${repo}/actions/artifacts/${art.id}.zip)`; + } else if(art.name.includes('sdl2-ryujinx-headless')) { hidden_headless_artifacts += `\n* [${art.name}](https://nightly.link/${owner}/${repo}/actions/artifacts/${art.id}.zip)`; } else { body += `\n* [${art.name}](https://nightly.link/${owner}/${repo}/actions/artifacts/${art.id}.zip)`; } } + hidden_avalonia_artifacts += `\n
`; hidden_headless_artifacts += `\n
`; hidden_debug_artifacts += `\n
`; + body += hidden_avalonia_artifacts; body += hidden_headless_artifacts; body += hidden_debug_artifacts; diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 1efb509fe..e68ae3a61 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -51,9 +51,9 @@ jobs: run: "mkdir release_output" - name: Publish Windows run: | - dotnet publish -c Release -r win-x64 -o ./publish_windows/publish /p:Version="${{ steps.version_info.outputs.build_version }}" /p:SourceRevisionId="${{ steps.version_info.outputs.git_short_hash }}" /p:DebugType=embedded Ryujinx --self-contained - dotnet publish -c Release -r win-x64 -o ./publish_windows_sdl2_headless/publish /p:Version="${{ steps.version_info.outputs.build_version }}" /p:SourceRevisionId="${{ steps.version_info.outputs.git_short_hash }}" /p:DebugType=embedded Ryujinx.Headless.SDL2 --self-contained - dotnet publish -c Release -r win-x64 -o ./publish_windows_ava/publish /p:Version="${{ steps.version_info.outputs.build_version }}" /p:SourceRevisionId="${{ steps.version_info.outputs.git_short_hash }}" /p:DebugType=embedded Ryujinx.Ava --self-contained + dotnet publish -c Release -r win10-x64 -o ./publish_windows/publish /p:Version="${{ steps.version_info.outputs.build_version }}" /p:SourceRevisionId="${{ steps.version_info.outputs.git_short_hash }}" /p:DebugType=embedded Ryujinx --self-contained + dotnet publish -c Release -r win10-x64 -o ./publish_windows_sdl2_headless/publish /p:Version="${{ steps.version_info.outputs.build_version }}" /p:SourceRevisionId="${{ steps.version_info.outputs.git_short_hash }}" /p:DebugType=embedded Ryujinx.Headless.SDL2 --self-contained + dotnet publish -c Release -r win10-x64 -o ./publish_windows_ava/publish /p:Version="${{ steps.version_info.outputs.build_version }}" /p:SourceRevisionId="${{ steps.version_info.outputs.git_short_hash }}" /p:DebugType=embedded Ryujinx.Ava --self-contained - name: Packing Windows builds run: | pushd publish_windows diff --git a/Ryujinx.Audio.Backends.SoundIo/Ryujinx.Audio.Backends.SoundIo.csproj b/Ryujinx.Audio.Backends.SoundIo/Ryujinx.Audio.Backends.SoundIo.csproj index ab2c282f8..1c8f7ad0e 100644 --- a/Ryujinx.Audio.Backends.SoundIo/Ryujinx.Audio.Backends.SoundIo.csproj +++ b/Ryujinx.Audio.Backends.SoundIo/Ryujinx.Audio.Backends.SoundIo.csproj @@ -3,7 +3,7 @@ net6.0 true - win-x64;linux-x64;osx-x64 + win10-x64;linux-x64;osx-x64 @@ -15,11 +15,11 @@ PreserveNewest libsoundio.dll - + PreserveNewest libsoundio.dylib - + PreserveNewest libsoundio.so diff --git a/Ryujinx.Ava/Ryujinx.Ava.csproj b/Ryujinx.Ava/Ryujinx.Ava.csproj index e5b7904d7..293243bac 100644 --- a/Ryujinx.Ava/Ryujinx.Ava.csproj +++ b/Ryujinx.Ava/Ryujinx.Ava.csproj @@ -1,7 +1,7 @@  net6.0 - win-x64;osx-x64;linux-x64 + win10-x64;osx-x64;linux-x64 Exe true 1.0.0-dirty diff --git a/Ryujinx.Headless.SDL2/Ryujinx.Headless.SDL2.csproj b/Ryujinx.Headless.SDL2/Ryujinx.Headless.SDL2.csproj index f1ee1fba1..89e7e81a9 100644 --- a/Ryujinx.Headless.SDL2/Ryujinx.Headless.SDL2.csproj +++ b/Ryujinx.Headless.SDL2/Ryujinx.Headless.SDL2.csproj @@ -2,7 +2,7 @@ net6.0 - win-x64;osx-x64;linux-x64 + win10-x64;osx-x64;linux-x64 Exe true 1.0.0-dirty diff --git a/Ryujinx.ShaderTools/Ryujinx.ShaderTools.csproj b/Ryujinx.ShaderTools/Ryujinx.ShaderTools.csproj index 803129c87..898528277 100644 --- a/Ryujinx.ShaderTools/Ryujinx.ShaderTools.csproj +++ b/Ryujinx.ShaderTools/Ryujinx.ShaderTools.csproj @@ -2,7 +2,6 @@ net6.0 - win-x64;osx-x64;linux-x64 Exe Debug;Release diff --git a/Ryujinx.Tests/Ryujinx.Tests.csproj b/Ryujinx.Tests/Ryujinx.Tests.csproj index 82047ca01..96778486a 100644 --- a/Ryujinx.Tests/Ryujinx.Tests.csproj +++ b/Ryujinx.Tests/Ryujinx.Tests.csproj @@ -2,7 +2,6 @@ net6.0 - win-x64;osx-x64;linux-x64 Exe false diff --git a/Ryujinx/Ryujinx.csproj b/Ryujinx/Ryujinx.csproj index 31da7d20a..fc8e33fee 100644 --- a/Ryujinx/Ryujinx.csproj +++ b/Ryujinx/Ryujinx.csproj @@ -2,7 +2,7 @@ net6.0 - win-x64;osx-x64;linux-x64 + win10-x64;osx-x64;linux-x64 Exe true 1.0.0-dirty