From 4958e03333af11c312968c27ed405d79e8aa5fac Mon Sep 17 00:00:00 2001 From: Jerome Laban Date: Mon, 2 Sep 2024 21:14:32 -0400 Subject: [PATCH] chore: Adjust net install --- .vsts-ci.yml | 1 - build/ci/stage-build-linux-tests.yml | 7 -- build/ci/stage-build-macos-tests.yml | 7 -- build/ci/stage-build-windows-tests.yml | 7 -- build/ci/stage-build-wsl-tests.yml | 115 ------------------------- 5 files changed, 137 deletions(-) delete mode 100644 build/ci/stage-build-wsl-tests.yml diff --git a/.vsts-ci.yml b/.vsts-ci.yml index 1f925c2..1b20c8e 100644 --- a/.vsts-ci.yml +++ b/.vsts-ci.yml @@ -54,4 +54,3 @@ stages: parameters: jobName: macOS_Tests vmImage: macOS-12 - - template: build/ci/stage-build-wsl-tests.yml diff --git a/build/ci/stage-build-linux-tests.yml b/build/ci/stage-build-linux-tests.yml index 4f18137..f2cdc7d 100644 --- a/build/ci/stage-build-linux-tests.yml +++ b/build/ci/stage-build-linux-tests.yml @@ -25,13 +25,6 @@ jobs: - template: gitversion.yml - template: dotnet-install.yml - - task: UseDotNet@2 - displayName: 'Use .NET SDK' - inputs: - packageType: sdk - version: 8.0.100 - includePreviewVersions: true - - bash: | cd $(build.sourcesdirectory)/src/Uno.Wasm.Bootstrap dotnet msbuild /r /p:Configuration=Release /p:DISABLE_CLIHOST_NET6=true diff --git a/build/ci/stage-build-macos-tests.yml b/build/ci/stage-build-macos-tests.yml index d6badf5..b5389d4 100644 --- a/build/ci/stage-build-macos-tests.yml +++ b/build/ci/stage-build-macos-tests.yml @@ -16,13 +16,6 @@ jobs: - template: gitversion.yml - template: dotnet-install.yml - - task: UseDotNet@2 - displayName: 'Use .NET SDK' - inputs: - packageType: sdk - version: 8.0.100 - includePreviewVersions: true - - bash: brew install ninja displayName: 'Install Ninja' diff --git a/build/ci/stage-build-windows-tests.yml b/build/ci/stage-build-windows-tests.yml index a037ef2..75bc7e9 100644 --- a/build/ci/stage-build-windows-tests.yml +++ b/build/ci/stage-build-windows-tests.yml @@ -22,13 +22,6 @@ jobs: - template: gitversion.yml - template: dotnet-install.yml - - task: UseDotNet@2 - displayName: 'Use .NET SDK' - inputs: - packageType: sdk - version: 8.0.100 - includePreviewVersions: true - - pwsh: | attrib +r "$(build.sourcesdirectory)/src" /s /d displayName: Set all repo files as readonly diff --git a/build/ci/stage-build-wsl-tests.yml b/build/ci/stage-build-wsl-tests.yml deleted file mode 100644 index 134f42b..0000000 --- a/build/ci/stage-build-wsl-tests.yml +++ /dev/null @@ -1,115 +0,0 @@ -parameters: - jobName: '' - -jobs: -- job: WSL_Tests - timeoutInMinutes: 90 - - pool: - vmImage: 'windows-2022' - - workspace: - clean: all - - steps: - - checkout: self - clean: true - - - pwsh: | - # Set-PSDebug -Trace 1 - - # Workaround from https://github.com/actions/runner-images/issues/6844#issuecomment-1367225048 - # At the time of this comment (30-12-2022) this only works on Azure DevOps hosted - # agents and doesn't work on 1ES images - Write-Host "wsl --update --web-download" - wsl --update --web-download | Out-String - - Write-Host "wsl --version" - wsl --version - - write-host "WSL install of ubuntu." - # wsl --install -d Ubuntu-22.04 --web-download # Similar to https://github.com/Azure/azure-sdk-for-cpp/issues/4397 - - # - # Manual installation of Ubuntu 20.04 - # - $url = "https://aka.ms/wslubuntu2004" # URL of the file to download - $appxInstaller = "$env:TEMP\appx-install" # Folder where the uncompressed files will be saved - $distroInstaller = "$env:TEMP\wsl-install" # Folder for the inner - - mkdir $appxInstaller - mkdir $distroInstaller - - # Download the file - Invoke-WebRequest $url -OutFile "$appxInstaller\distro.zip" - - # Uncompress the file - Expand-Archive -Path "$appxInstaller\distro.zip" -DestinationPath $appxInstaller - - Expand-Archive -Path "$appxInstaller\Ubuntu*_x64.appx" -DestinationPath $distroInstaller - - & $distroInstaller\ubuntu.exe install --root - - # - # End Manual install - # - - write-host "Launch WSL." - $wsl = wsl -l -v | out-string - - write-host $wsl - - # workaround for encoding issue: https://github.com/microsoft/terminal/issues/110 - while ($wsl -notmatch "R`0u`0n`0n`0i`0n`0g") { - start-sleep -seconds 1 - $wsl = wsl -l -v | out-string - write-host $wsl - } - write-host "Ubuntu installed." - - displayName: Install WSL - - - pwsh: | - wsl wget https://packages.microsoft.com/config/ubuntu/22.04/packages-microsoft-prod.deb -O packages-microsoft-prod.deb - wsl sudo dpkg -i packages-microsoft-prod.deb - wsl rm packages-microsoft-prod.deb - wsl sudo apt-get update - wsl sudo apt-get install -y ninja-build lbzip2 - wsl sudo apt-get install -y dotnet-sdk-7.0 - displayName: Install WSL dependencies - - - task: UseDotNet@2 - displayName: 'Use .NET SDK' - inputs: - packageType: sdk - version: 8.0.100 - includePreviewVersions: true - - - pwsh: | - cd $(build.sourcesdirectory)/src/Uno.Wasm.Bootstrap - dotnet msbuild /r /p:Configuration=Release /p:DISABLE_CLIHOST_NET6=true - displayName: Build bootstrap - - # Static linking test (WSL Forced) - - pwsh: | - cd $(build.sourcesdirectory)/src/Uno.Wasm.StaticLinking.net7 - dotnet clean -c Release /p:DISABLE_CLIHOST_NET6=true - dotnet publish -c Release /m:1 /p:DISABLE_CLIHOST_NET6=true /p:WasmShellEnableEmscriptenWindows=false /p:WasmShellEmccLinkOptimization=false /bl:$(build.artifactstagingdirectory)/SampleNet7-win-wsl.binlog - displayName: Build StaticLinking.Aot Sample (net7 WSL Forced) - - - pwsh: | - $(build.sourcesdirectory)\build\scripts\run-tests-windows.ps1 ` - "$(build.sourcesdirectory)\src\Uno.Wasm.StaticLinking.Net7\bin\Release\net7.0\dist" ` - "$(build.sourcesdirectory)\src\Uno.Wasm.StaticLinking.Aot.UITests" ` - "http://localhost:8000/" - - displayName: StaticLinking.Aot Tests net7 - env: - BUILD_SOURCESDIRECTORY: "$(build.sourcesdirectory)" - - - task: PublishBuildArtifacts@1 - condition: always() - inputs: - PathtoPublish: $(build.artifactstagingdirectory) - ArtifactName: uno-wasm-bootstrap-windows-test - ArtifactType: Container