diff --git a/appveyor.yml b/appveyor.yml index 3a9a34b8a..0a04c0d4f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -2,7 +2,7 @@ version: 3.0.1.{build} image: Visual Studio 2019 clone_folder: C:\ProxSpace\pm3\proxmark cache: - - C:\ps-cache + - C:\ps-cache -> appveyor.yml environment: proxspace_url: https://github.com/Gator96100/ProxSpace/archive/master.zip proxspace_zip_file: \proxspace.zip @@ -52,8 +52,6 @@ clone_script: Write-Host "[ OK ]" -ForegroundColor Green } - $global:wsl_install_running = true - $WSLjob = Start-Job -Name WSLInstall -ScriptBlock { Function WSLExec($Text, $Cmd) { Write-Host "$Text" @@ -69,7 +67,7 @@ clone_script: WSLExec "WSL install..." "sudo apt-get -y install --reinstall --no-install-recommends git ca-certificates build-essential pkg-config libreadline-dev gcc-arm-none-eabi libnewlib-dev libbz2-dev qtbase5-dev cmake 1>/dev/null" WSLExec "WSL QT fix..." "sudo strip --remove-section=.note.ABI-tag /usr/lib/x86_64-linux-gnu/libQt5Core.so.5" Add-AppveyorMessage -Message "WSL setup took $(([System.Environment]::TickCount-$WSLInstallTime) / 1000) sec" -Category Information - $global:wsl_install_running = false + New-Item -ItemType "file" -Path "C:\WSL-Finished.txt" -Force } $env:PSInstallTime=[System.Environment]::TickCount @@ -237,15 +235,14 @@ build_script: } #WSL: wait for installation to finish - if($global:wsl_install_running){ + if(!(Test-Path "C:\WSL-Finished.txt")){ Write-Host "Waiting for WSL installation to finish..." -NoNewLine - while($global:wsl_install_running) { + while(!(Test-Path "C:\WSL-Finished.txt")) { Start-Sleep -s 5 } - Write-Host "$Name [ OK ]" -ForegroundColor Green + Remove-Item -Force "C:\WSL-Finished.txt" -ErrorAction SilentlyContinue + Write-Host "$Name [ OK ]" -ForegroundColor Green } - - Add-AppveyorMessage -Message "WSL start: $global:wsl_install_running" -Category Information #Windows Subsystem for Linux (WSL) Write-Host "---------- WSL make ----------" -ForegroundColor Yellow