Skip to content

Use same Tls as Prep #3429

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

Merged
merged 2 commits into from
Feb 15, 2023
Merged

Use same Tls as Prep #3429

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ef5aad9
use same tls as prep
ami-GS Feb 14, 2023
a2e2c31
copy get-buildconfig.ps1 for performance test
ami-GS Feb 14, 2023
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
1 change: 1 addition & 0 deletions scripts/performance.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
10 changes: 3 additions & 7 deletions scripts/prepare-machine.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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. " +
Expand All @@ -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) {
Expand Down Expand Up @@ -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"
Expand Down