From 046490f7ff7af5cbbcc4d2d96fd2fae7d9b44167 Mon Sep 17 00:00:00 2001 From: Leonardo Venturini Date: Mon, 29 Jul 2024 09:27:43 -0400 Subject: [PATCH] add up-to-date windows scripts --- scripts/windows/{appveyor => ci}/install.ps1 | 5 ++--- scripts/windows/{appveyor => ci}/test.ps1 | 17 ++--------------- 2 files changed, 4 insertions(+), 18 deletions(-) rename scripts/windows/{appveyor => ci}/install.ps1 (94%) rename scripts/windows/{appveyor => ci}/test.ps1 (53%) diff --git a/scripts/windows/appveyor/install.ps1 b/scripts/windows/ci/install.ps1 similarity index 94% rename from scripts/windows/appveyor/install.ps1 rename to scripts/windows/ci/install.ps1 index ced6023ad5..77b03a2de0 100644 --- a/scripts/windows/appveyor/install.ps1 +++ b/scripts/windows/ci/install.ps1 @@ -1,4 +1,4 @@ -# Appveyor already sets $PLATFORM to exactly what we don't want, so +# Appveyor already sets $PLATFORM to exactly what we don't want, so # we'll prepend it with 'windows_' if that seems to be the case. If ($env:PLATFORM -Match '^x86|x64$') { $env:PLATFORM = "windows_${env:PLATFORM}" @@ -32,9 +32,8 @@ while ($attempt -gt 0 -and -not $success) { } else { $attempt-- } - } If ($LASTEXITCODE -ne 0) { throw "Running .\meteor --get-ready failed three times." -} +} \ No newline at end of file diff --git a/scripts/windows/appveyor/test.ps1 b/scripts/windows/ci/test.ps1 similarity index 53% rename from scripts/windows/appveyor/test.ps1 rename to scripts/windows/ci/test.ps1 index f8ef08707d..fb813d33fa 100644 --- a/scripts/windows/appveyor/test.ps1 +++ b/scripts/windows/ci/test.ps1 @@ -1,4 +1,4 @@ -# For now, we only have one script. +# For now, we only have one script. $jUnit = Join-Path $env:TEMP 'self-test-junit-0.xml' $tests = @( @@ -25,19 +25,6 @@ If ($selfTestExitCode -eq 0) { Write-Host "FAILURE! (Exit: $selfTestExitCode)" -ForegroundColor Red } -Write-Host "Uploading JUnit test results..." -ForegroundColor Magenta -$wc = New-Object 'System.Net.WebClient' -Get-ChildItem $env:TEMP 'self-test-junit-*.xml' | Foreach-Object { - Write-Host " - $($_.FullName)" -ForegroundColor Magenta - Write-Host " - as Artifact..." -ForegroundColor Magenta - Push-AppveyorArtifact $_.FullName - Write-Host " - as Test Results..." -ForegroundColor Magenta - $artifactPostUrl = ` - "https://ci.appveyor.com/api/testresults/junit/", - $env:APPVEYOR_JOB_ID -Join '' - $wc.UploadFile($artifactPostUrl, ($_.FullName)) -} - If ($selfTestExitCode -ne 0) { Exit $selfTestExitCode -} +} \ No newline at end of file