Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
34 changes: 28 additions & 6 deletions .github/actions/ci/run-tests/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,28 +66,33 @@ runs:
echo "TemplateArgs = '$templateArgs'"
$dotnetVersion = $env:TargetDotNetVersion
$ValidationUnoCheckVersion = "invalid"
$IosRuntimeVersion = ""

if ($templateArgs -match 'net9.0')
{
$dotnetVersion = '9.0.308'
$ValidationUnoCheckVersion = $env:ValidationUnoCheckVersionNet9
$XcodeVersion = $env:XcodeVersionNet9
$dotnetVersion = '9.0.308'
$ValidationUnoCheckVersion = $env:ValidationUnoCheckVersionNet9
$XcodeVersion = $env:XcodeVersionNet9
$IosRuntimeVersion = '26.2'
}

if ($templateArgs -match 'net10.0')
{
$dotnetVersion = '10.0.100'
$ValidationUnoCheckVersion = $env:ValidationUnoCheckVersionNet10
$XcodeVersion = $env:XcodeVersionNet10
$dotnetVersion = '10.0.100'
$ValidationUnoCheckVersion = $env:ValidationUnoCheckVersionNet10
$XcodeVersion = $env:XcodeVersionNet10
$IosRuntimeVersion = '26.2'
}

echo "Dotnet Version = '$dotnetVersion'"
echo "UnoCheck Version = '$ValidationUnoCheckVersion'"
echo "Xcode Version = '$XcodeVersion'"
echo "iOS Runtime Version = '$IosRuntimeVersion'"

echo "DotNetVersion=$dotnetVersion" >> $env:GITHUB_ENV
echo "ValidationUnoCheckVersion=$ValidationUnoCheckVersion" >> $env:GITHUB_ENV
echo "XcodeRoot=$XcodeVersion" >> $env:GITHUB_ENV
echo "IosRuntimeVersion=$IosRuntimeVersion" >> $env:GITHUB_ENV
env:
TargetDotNetVersion: ${{ env.ValidationDotNetVersion }}
ValidationUnoCheckVersionNet10: ${{ env.ValidationUnoCheckVersionNet10 }}
Expand Down Expand Up @@ -176,6 +181,18 @@ runs:
echo 'MD_APPLE_SDK_ROOT=${{ env.XcodeRoot }}' >> $GITHUB_ENV
sudo xcode-select --switch ${{ env.XcodeRoot }}/Contents/Developer

- name: 'Ensure iOS simulator runtime'
if: runner.os == 'macOS' && env.IosRuntimeVersion != ''
shell: bash
run: |
echo "Checking iOS simulator runtime ${{ env.IosRuntimeVersion }}"
if xcrun simctl list runtimes | grep -q "iOS ${{ env.IosRuntimeVersion }}"; then
echo "iOS runtime ${{ env.IosRuntimeVersion }} already installed"
exit 0
fi
echo "Downloading iOS simulator runtime ${{ env.IosRuntimeVersion }}"
sudo xcodebuild -downloadPlatform iOS -buildVersion ${{ env.IosRuntimeVersion }}

- name: 'Install ninja'
if: runner.os == 'macOS'
shell: bash
Expand Down Expand Up @@ -354,6 +371,11 @@ runs:
"-p:TreatWarningsAsErrors=true"
);

if ($IsMacos)
{
$extraArgs += "-p:ValidateXcodeVersion=false"
}

& dotnet build $testName.sln "/bl:${{ github.workspace }}/artifacts/logs/$testName.${{ runner.os }}.$dotnetVersion.binlog" $extraArgs
if ($LASTEXITCODE -ne 0)
{
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@ env:
ValidationUnoCheckVersionNet9: '1.32.23'
ValidationUnoCheckVersionNet10: '1.33.0-dev.30'
ValidationDotNetVersion: '9.0.308'
XcodeVersionNet9: '/Applications/Xcode_26.0.1.app'
XcodeVersionNet10: '/Applications/Xcode_26.0.1.app'
XcodeVersionNet9: '/Applications/Xcode_26.2.app'
XcodeVersionNet10: '/Applications/Xcode_26.2.app'

# https://github.com/unoplatform/Uno.Wasm.Bootstrap/pull/887 remove when upgarding to .NET 9
# compatible version of the bootstrapper
Expand Down