From ef5aad9ce556911c9b45ceeb71283fb94f282658 Mon Sep 17 00:00:00 2001 From: ami-GS <1991.daiki@gmail.com> Date: Tue, 14 Feb 2023 09:38:48 -0800 Subject: [PATCH 1/2] use same tls as prep --- scripts/prepare-machine.ps1 | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/scripts/prepare-machine.ps1 b/scripts/prepare-machine.ps1 index 1ebe9bb30b..7eccff4b12 100644 --- a/scripts/prepare-machine.ps1 +++ b/scripts/prepare-machine.ps1 @@ -103,6 +103,9 @@ Set-StrictMode -Version 'Latest' $PSDefaultParameterValues['*:ErrorAction'] = 'Stop' $ProgressPreference = 'SilentlyContinue' +$PrepConfig = & (Join-Path $PSScriptRoot get-buildconfig.ps1) -Tls $Tls +$Tls = $PrepConfig.Tls + if ($PSVersionTable.PSVersion.Major -lt 7) { # This script requires PowerShell core (mostly for xplat stuff). Write-Error ("`nPowerShell v7.x or greater is needed for this script to work. " + @@ -116,7 +119,6 @@ if (!$ForOneBranch -and !$ForOneBranchPackage -and !$ForBuild -and !$ForTest -an Write-Host "No arguments passed, defaulting -ForBuild and -ForTest" $ForBuild = $true $ForTest = $true - if ("" -eq $Tls -and !$ForKernel) { $Tls = "openssl" } } if ($ForBuild) { @@ -146,12 +148,6 @@ if ($InstallXdpDriver) { $InstallXdpSdk = $true } -# Default TLS based on current platform. -if ("" -eq $Tls) { - if ($IsWindows) { $Tls = "schannel" } - else { $Tls = "openssl" } -} - # Root directory of the project. $RootDir = Split-Path $PSScriptRoot -Parent $ArtifactsPath = Join-Path $RootDir "artifacts" From a2e2c31ef30843fc582b56c19b35443c0e891b5c Mon Sep 17 00:00:00 2001 From: ami-GS <1991.daiki@gmail.com> Date: Tue, 14 Feb 2023 11:52:23 -0800 Subject: [PATCH 2/2] copy get-buildconfig.ps1 for performance test --- scripts/performance.ps1 | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/performance.ps1 b/scripts/performance.ps1 index 9b5ea26131..b48919f41d 100644 --- a/scripts/performance.ps1 +++ b/scripts/performance.ps1 @@ -284,6 +284,7 @@ $LocalDirectory = Join-Path $RootDir "artifacts/bin" $RemoteDirectorySMB = $null # Copy manifest and log script to local directory +Copy-Item -Path (Join-Path $RootDir scripts get-buildconfig.ps1) -Destination $LocalDirectory Copy-Item -Path (Join-Path $RootDir scripts log.ps1) -Destination $LocalDirectory Copy-Item -Path (Join-Path $RootDir scripts xdp-devkit.json) -Destination $LocalDirectory Copy-Item -Path (Join-Path $RootDir scripts prepare-machine.ps1) -Destination $LocalDirectory