From 9543f28e5f0f20b45053b1c5482f34f46bdd776b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Laban?= Date: Tue, 7 Jan 2025 11:00:50 -0500 Subject: [PATCH 1/3] fix: Use bash on macos The latest update of dotnet-install.sh explicitly uses bash options (cherry picked from commit 6c7a6ea0cbb794ad873037ed5c2ca22ddcd72498) --- UnoCheck/Solutions/DotNetSdkScriptInstallSolution.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UnoCheck/Solutions/DotNetSdkScriptInstallSolution.cs b/UnoCheck/Solutions/DotNetSdkScriptInstallSolution.cs index 6eb97d4..c67ebbc 100644 --- a/UnoCheck/Solutions/DotNetSdkScriptInstallSolution.cs +++ b/UnoCheck/Solutions/DotNetSdkScriptInstallSolution.cs @@ -51,7 +51,7 @@ public override async Task Implement(SharedState sharedState, CancellationToken var exe = Util.Platform switch { Platform.Linux => "bash", - Platform.OSX => "sh", + Platform.OSX => "bash", Platform.Windows => "powershell", _ => throw new NotSupportedException($"Unsupported platform {Util.Platform}") }; From 106ed42ceb9f08dc8edd06ee5fe88f8abd1bd289 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Laban?= Date: Tue, 7 Jan 2025 13:48:53 -0500 Subject: [PATCH 2/3] chore: Bump to macos-13 --- .github/workflows/ci.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 10da2f9..9d2c55c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -189,56 +189,56 @@ jobs: include: - manifest: 'manifests/uno.ui.manifest.json' manifest_name: Stable - os: macos-12 + os: macos-13 dotnet_version: 8.0.300 - manifest: 'manifests/uno.ui-preview.manifest.json' manifest_name: Preview previous_tool_version: '' previous_tool_params: '' - os: macos-12 + os: macos-13 dotnet_version: 8.0.300 # - manifest: 'manifests/uno.ui-preview-major.manifest.json' # manifest_name: Preview net9 # previous_tool_version: '' # previous_tool_params: '' - # os: macos-12 + # os: macos-13 # dotnet_version: 8.0.100 - manifest: 'manifests/uno.ui.manifest.json' manifest_name: Stable Upgrade previous_tool_version: 1.17.0 previous_tool_params: '' - os: macos-12 + os: macos-13 dotnet_version: 8.0.300 - manifest: 'manifests/uno.ui-preview.manifest.json' manifest_name: Preview Upgrade previous_tool_version: 1.17.0 previous_tool_params: '--pre' - os: macos-12 + os: macos-13 dotnet_version: 8.0.300 - manifest: 'manifests/uno.ui.manifest.json' manifest_name: Test default Uno template TFM's - os: macos-12 + os: macos-13 dotnet_version: 8.0.300 tool_params: '--tfm net8.0-android --tfm net8.0-ios --tfm net8.0-maccatalyst --tfm net8.0-windows10.0.19041 --tfm net8.0-browserwasm --tfm net8.0-desktop' - manifest: 'manifests/uno.ui.manifest.json' manifest_name: Test net8.0-android\ios TFM's - os: macos-12 + os: macos-13 dotnet_version: 8.0.300 tool_params: '--tfm net8.0-android --tfm net8.0-ios' - manifest: 'manifests/uno.ui.manifest.json' manifest_name: Test net8.0-browserwasm TFM - os: macos-12 + os: macos-13 dotnet_version: 8.0.300 tool_params: '--tfm net8.0-browserwasm' # - manifest: 'manifests/uno.ui-preview-major.manifest.json' # manifest_name: Preview Upgrade net8 # previous_tool_version: 1.4.2 # previous_tool_params: '--pre' - # os: macos-12 + # os: macos-13 # dotnet_version: 8.0.100 # Disabled for android emulator setup issues From e737f8de963e2b198224aa24603476e6f78e482a Mon Sep 17 00:00:00 2001 From: Jerome Laban Date: Tue, 7 Jan 2025 14:07:08 -0500 Subject: [PATCH 3/3] chore: Disable android emulator Fixed in 1.28 --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9d2c55c..7517532 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -297,7 +297,7 @@ jobs: $ProgressPreference = 'SilentlyContinue' & dotnet --list-sdks & dotnet tool install --global --version ${{ matrix.previous_tool_version }} uno.check - & uno-check --ci --fix --non-interactive --verbose --skip xcode --skip vswin --skip vsmac --skip wsl --skip edgewebview2 ${{ matrix.previous_tool_params }} + & uno-check --ci --fix --non-interactive --verbose --skip xcode --skip vswin --skip vsmac --skip androidemulator --skip wsl --skip edgewebview2 ${{ matrix.previous_tool_params }} & dotnet tool uninstall --global uno.check - name: Install and Run Tool @@ -307,7 +307,7 @@ jobs: $ProgressPreference = 'SilentlyContinue' & dotnet --list-sdks & dotnet tool install --global --version ${{ steps.gitversion.outputs.semVer }} --add-source NuGet/ uno.check - & uno-check --ci --fix --non-interactive --verbose --skip xcode --skip vswin --skip vsmac --skip wsl --skip edgewebview2 --manifest ${{ matrix.manifest }} ${{ matrix.tool_params }} + & uno-check --ci --fix --non-interactive --verbose --skip xcode --skip vswin --skip vsmac --skip androidemulator --skip wsl --skip edgewebview2 --manifest ${{ matrix.manifest }} ${{ matrix.tool_params }} testlinux: name: Validate Tool - Linux - ${{ matrix.manifest_name }}