Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Use bash on macos (backport #323) #325

Merged
merged 3 commits into from
Jan 7, 2025
Merged

fix: Use bash on macos (backport #323) #325

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9543f28
fix: Use bash on macos
jeromelaban Jan 7, 2025
106ed42
chore: Bump to macos-13
jeromelaban Jan 7, 2025
e737f8d
chore: Disable android emulator
jeromelaban Jan 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 11 additions & 11 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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 }}
Expand Down
2 changes: 1 addition & 1 deletion UnoCheck/Solutions/DotNetSdkScriptInstallSolution.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}")
};
Expand Down
Loading