From f7f4ce1fb730d099e2ac3aef6b15ba4916fcda82 Mon Sep 17 00:00:00 2001 From: Gator96100 Date: Mon, 5 Oct 2020 12:35:10 +0200 Subject: [PATCH 01/23] Enabled debug output --- appveyor.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 8586bb48a..28ced036e 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:\cache -> appveyor.yml + - C:\cache environment: proxspace_url: https://github.com/Gator96100/ProxSpace/archive/master.zip proxspace_zip_file: \proxspace.zip @@ -156,6 +156,7 @@ install: Start-Sleep -s 5 Receive-Job -Name WSLInstall } + Receive-Job -Wait -Name PSInstall } Function GitClone($Text, $Folder) { From 91c9136347bf25afba3e4b1cae9bca4e97de8be3 Mon Sep 17 00:00:00 2001 From: Gator96100 Date: Mon, 5 Oct 2020 13:18:18 +0200 Subject: [PATCH 02/23] Moved cache creation to on_finish --- appveyor.yml | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 28ced036e..cff59e737 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -265,16 +265,6 @@ build_script: #ProxSpace - Write-Host "ProxSpace: create new cache..." -NoNewLine - - ExecMinGWCmd 'yes | pacman -Sc > /dev/null 2>&1' - - Remove-Item -Recurse -Force -Path "$env:proxspace_cache_path" -ErrorAction SilentlyContinue - - Move-Item -Path "$env:proxspace_path\msys2\var\cache" -Destination "$env:proxspace_cache_path" -Force - - Write-Host "[ OK ]" -ForegroundColor Gree - Write-Host "---------- PS make ----------" -ForegroundColor Yellow $TestTime=[System.Environment]::TickCount @@ -333,4 +323,17 @@ on_success: on_failure: - ps: Write-Host "Build error." -ForegroundColor Red on_finish: -- ps: # $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) +- ps: >- + # $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) + + Write-Host "ProxSpace: create new cache..." -NoNewLine + + cd $env:proxspace_path + + ./runme64.bat -c "yes | pacman -Sc > /dev/null 2>&1" + + Remove-Item -Recurse -Force -Path "$env:proxspace_cache_path" -ErrorAction SilentlyContinue + + Move-Item -Path "$env:proxspace_path\msys2\var\cache" -Destination "$env:proxspace_cache_path" -Force + + Write-Host "[ OK ]" -ForegroundColor Gree From bc20c0e6fcf42312f67024e930808b281c7f1dd8 Mon Sep 17 00:00:00 2001 From: Gator96100 Date: Mon, 5 Oct 2020 13:23:15 +0200 Subject: [PATCH 03/23] WIP --- appveyor.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index cff59e737..7c99e48b4 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -324,8 +324,9 @@ on_failure: - ps: Write-Host "Build error." -ForegroundColor Red on_finish: - ps: >- - # $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) - + + # $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) + Write-Host "ProxSpace: create new cache..." -NoNewLine cd $env:proxspace_path @@ -337,3 +338,4 @@ on_finish: Move-Item -Path "$env:proxspace_path\msys2\var\cache" -Destination "$env:proxspace_cache_path" -Force Write-Host "[ OK ]" -ForegroundColor Gree + \ No newline at end of file From cb8635767b589aaa444ce917248b0ffd796ca44d Mon Sep 17 00:00:00 2001 From: Gator96100 Date: Mon, 5 Oct 2020 13:44:26 +0200 Subject: [PATCH 04/23] WIP --- appveyor.yml | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 7c99e48b4..ded1fc55a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -176,7 +176,7 @@ install: Write-Host "ProxSpace: move cache..." -NoNewLine - Move-Item -Path "$env:proxspace_cache_path" -Destination "$env:proxspace_path\msys2\var\cache" -Force -ErrorAction SilentlyContinue + #Move-Item -Path "$env:proxspace_cache_path" -Destination "$env:proxspace_path\msys2\var\cache" -Force -ErrorAction SilentlyContinue Write-Host "[ OK ]" -ForegroundColor Gree @@ -265,6 +265,18 @@ build_script: #ProxSpace + Write-Host "ProxSpace: create new cache..." -NoNewLine + + cd $env:proxspace_path + + #./runme64.bat -c "yes | pacman -Sc > /dev/null 2>&1" + + #Remove-Item -Recurse -Force -Path "$env:proxspace_cache_path" -ErrorAction SilentlyContinue + + #Move-Item -Path "$env:proxspace_path\msys2\var\cache" -Destination "$env:proxspace_cache_path" -Force + + Write-Host "[ OK ]" -ForegroundColor Gree + Write-Host "---------- PS make ----------" -ForegroundColor Yellow $TestTime=[System.Environment]::TickCount @@ -301,6 +313,8 @@ build_script: ExecMinGWCmd 'mkdir -p client/build; cd client/build; cmake -G""MSYS Makefiles"" ..; make VERBOSE=1;' + ExecMinGWCmd 'cat /pm3/proxmark/client/build/CMakeFiles/CMakeOutput.log' + Write-Host "---------- PS cmake tests ----------" -ForegroundColor Yellow ExecMinGWCmd './tools/pm3_tests.sh --clientbin client/build/proxmark3.exe client' @@ -323,19 +337,4 @@ on_success: on_failure: - ps: Write-Host "Build error." -ForegroundColor Red on_finish: -- ps: >- - - # $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) - - Write-Host "ProxSpace: create new cache..." -NoNewLine - - cd $env:proxspace_path - - ./runme64.bat -c "yes | pacman -Sc > /dev/null 2>&1" - - Remove-Item -Recurse -Force -Path "$env:proxspace_cache_path" -ErrorAction SilentlyContinue - - Move-Item -Path "$env:proxspace_path\msys2\var\cache" -Destination "$env:proxspace_cache_path" -Force - - Write-Host "[ OK ]" -ForegroundColor Gree - \ No newline at end of file +- ps: # $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) \ No newline at end of file From 9512e349a7e901d1b6a8ff845ba1a5216aae306c Mon Sep 17 00:00:00 2001 From: Gator96100 Date: Mon, 5 Oct 2020 14:22:43 +0200 Subject: [PATCH 05/23] WIP --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index ded1fc55a..cdd337a0d 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -232,7 +232,7 @@ build_script: } #WSL: wait for installation to finish - Receive-Job -Wait -Name WSLInstall + Receive-Job -Wait -Name WSLInstall -ErrorAction SilentlyContinue #Windows Subsystem for Linux (WSL) Write-Host "---------- WSL make ----------" -ForegroundColor Yellow From 678cbf35767da6dd27e0936135f9ad1ae86838df Mon Sep 17 00:00:00 2001 From: Gator96100 Date: Mon, 5 Oct 2020 14:27:50 +0200 Subject: [PATCH 06/23] WIP --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index cdd337a0d..891012725 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -154,9 +154,9 @@ install: } Start-Sleep -s 5 - Receive-Job -Name WSLInstall + Receive-Job -Name WSLInstall -ErrorAction SilentlyContinue } - Receive-Job -Wait -Name PSInstall + #Receive-Job -Wait -Name PSInstall } Function GitClone($Text, $Folder) { From 21251b32208b5bbb43a1113ca1876b2cd285b63c Mon Sep 17 00:00:00 2001 From: Gator96100 Date: Mon, 5 Oct 2020 15:40:17 +0200 Subject: [PATCH 07/23] Enabled cache creation --- appveyor.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 891012725..a40d2955c 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -269,11 +269,11 @@ build_script: cd $env:proxspace_path - #./runme64.bat -c "yes | pacman -Sc > /dev/null 2>&1" + ./runme64.bat -c "yes | pacman -Sc > /dev/null 2>&1" - #Remove-Item -Recurse -Force -Path "$env:proxspace_cache_path" -ErrorAction SilentlyContinue + Remove-Item -Recurse -Force -Path "$env:proxspace_cache_path" -ErrorAction SilentlyContinue - #Move-Item -Path "$env:proxspace_path\msys2\var\cache" -Destination "$env:proxspace_cache_path" -Force + Move-Item -Path "$env:proxspace_path\msys2\var\cache" -Destination "$env:proxspace_cache_path" -Force Write-Host "[ OK ]" -ForegroundColor Gree From 4685c5ae707e8743b6ae28cb4eddf939b50ba99c Mon Sep 17 00:00:00 2001 From: Gator96100 Date: Mon, 5 Oct 2020 17:03:07 +0200 Subject: [PATCH 08/23] Enabled cache usage --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index a40d2955c..e849d670b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -176,7 +176,7 @@ install: Write-Host "ProxSpace: move cache..." -NoNewLine - #Move-Item -Path "$env:proxspace_cache_path" -Destination "$env:proxspace_path\msys2\var\cache" -Force -ErrorAction SilentlyContinue + Move-Item -Path "$env:proxspace_cache_path" -Destination "$env:proxspace_path\msys2\var\cache" -Force -ErrorAction SilentlyContinue Write-Host "[ OK ]" -ForegroundColor Gree From fcff53517b1a38b875129ba1c57d44690e41917c Mon Sep 17 00:00:00 2001 From: Gator96100 Date: Mon, 5 Oct 2020 17:54:39 +0200 Subject: [PATCH 09/23] Copy cache --- appveyor.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index e849d670b..5331c1472 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -176,7 +176,9 @@ install: Write-Host "ProxSpace: move cache..." -NoNewLine - Move-Item -Path "$env:proxspace_cache_path" -Destination "$env:proxspace_path\msys2\var\cache" -Force -ErrorAction SilentlyContinue + New-Item -ItemType Directory -Force -Path "$env:proxspace_path\msys2\var\cache\" + + Copy-Item -Path "$env:proxspace_cache_path\*" -Destination "$env:proxspace_path\msys2\var\cache\" -Force -Recurse -ErrorAction SilentlyContinue Write-Host "[ OK ]" -ForegroundColor Gree From 93f438d71a0a12bdcf7122f127ab46070090fcb2 Mon Sep 17 00:00:00 2001 From: Gator96100 Date: Mon, 5 Oct 2020 18:03:42 +0200 Subject: [PATCH 10/23] WIP --- appveyor.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 5331c1472..ba798ab2b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -176,10 +176,16 @@ install: Write-Host "ProxSpace: move cache..." -NoNewLine - New-Item -ItemType Directory -Force -Path "$env:proxspace_path\msys2\var\cache\" + New-Item -ItemType Directory -Force -Path "$env:proxspace_path\msys2\var\cache\" | Out-Null Copy-Item -Path "$env:proxspace_cache_path\*" -Destination "$env:proxspace_path\msys2\var\cache\" -Force -Recurse -ErrorAction SilentlyContinue + Get-ChildItem "$env:proxspace_path\msys2\var\cache\" + + Get-ChildItem "$env:proxspace_path\msys2\var\cache\pacman\" + + Get-ChildItem "$env:proxspace_path\msys2\var\cache\pacman\pkg\" + Write-Host "[ OK ]" -ForegroundColor Gree ExecUpdate "ProxSpace: initial msys2 startup..." $true From 004318a8d857735493a8afe251dacc4bd55c26d9 Mon Sep 17 00:00:00 2001 From: Gator96100 Date: Mon, 5 Oct 2020 18:30:09 +0200 Subject: [PATCH 11/23] Cleanup --- appveyor.yml | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index ba798ab2b..0d960d04a 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:\cache + - C:\cache -> appveyor.yml environment: proxspace_url: https://github.com/Gator96100/ProxSpace/archive/master.zip proxspace_zip_file: \proxspace.zip @@ -180,12 +180,6 @@ install: Copy-Item -Path "$env:proxspace_cache_path\*" -Destination "$env:proxspace_path\msys2\var\cache\" -Force -Recurse -ErrorAction SilentlyContinue - Get-ChildItem "$env:proxspace_path\msys2\var\cache\" - - Get-ChildItem "$env:proxspace_path\msys2\var\cache\pacman\" - - Get-ChildItem "$env:proxspace_path\msys2\var\cache\pacman\pkg\" - Write-Host "[ OK ]" -ForegroundColor Gree ExecUpdate "ProxSpace: initial msys2 startup..." $true @@ -221,6 +215,7 @@ build_script: $WSLjob = Start-Job -Name WSLCompile -ScriptBlock { Function ExecWSLCmd($Cmd) { + cd $env:wsl_git_path wsl -- bash -c $Cmd } @@ -244,7 +239,6 @@ build_script: #Windows Subsystem for Linux (WSL) Write-Host "---------- WSL make ----------" -ForegroundColor Yellow - cd $env:wsl_git_path $TestTime=[System.Environment]::TickCount ExecWSLCmd "make clean;make V=1" #some checks From de2b098731d0ded4496f3ee192b3dd906b7c597f Mon Sep 17 00:00:00 2001 From: Gator96100 Date: Mon, 5 Oct 2020 19:05:54 +0200 Subject: [PATCH 12/23] Removed debug output --- appveyor.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 0d960d04a..e8022a4b8 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -315,8 +315,6 @@ build_script: ExecMinGWCmd 'mkdir -p client/build; cd client/build; cmake -G""MSYS Makefiles"" ..; make VERBOSE=1;' - ExecMinGWCmd 'cat /pm3/proxmark/client/build/CMakeFiles/CMakeOutput.log' - Write-Host "---------- PS cmake tests ----------" -ForegroundColor Yellow ExecMinGWCmd './tools/pm3_tests.sh --clientbin client/build/proxmark3.exe client' From 6fb7f0d45900339e5bab86f823e5030ac68f06a7 Mon Sep 17 00:00:00 2001 From: Gator96100 Date: Mon, 5 Oct 2020 19:35:50 +0200 Subject: [PATCH 13/23] Moved cache folder --- appveyor.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index e8022a4b8..a43c1178c 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -2,14 +2,14 @@ version: 3.0.1.{build} image: Visual Studio 2019 clone_folder: C:\ProxSpace\pm3\proxmark cache: - - C:\cache -> appveyor.yml + - C:\ps-cache -> appveyor.yml environment: proxspace_url: https://github.com/Gator96100/ProxSpace/archive/master.zip proxspace_zip_file: \proxspace.zip proxspace_zip_folder_name: ProxSpace-* proxspace_path: C:\ProxSpace proxspace_home_path: \ProxSpace\pm3 - proxspace_cache_path: C:\cache + proxspace_cache_path: C:\ps-cache wsl_git_path: C:\proxmark APPVEYOR_SAVE_CACHE_ON_ERROR: true From d8378cee310d914dfdc28bcfc8b806217e895ec9 Mon Sep 17 00:00:00 2001 From: Gator96100 Date: Mon, 5 Oct 2020 20:29:12 +0200 Subject: [PATCH 14/23] Test --- appveyor.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/appveyor.yml b/appveyor.yml index a43c1178c..10ba9090c 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -236,6 +236,8 @@ build_script: #WSL: wait for installation to finish Receive-Job -Wait -Name WSLInstall -ErrorAction SilentlyContinue + + Add-AppveyorMessage -Message "WSL start" -Category Information #Windows Subsystem for Linux (WSL) Write-Host "---------- WSL make ----------" -ForegroundColor Yellow From fc7ec34ca3bc6949f59c25f454bf3e5d2c23d1c2 Mon Sep 17 00:00:00 2001 From: Gator96100 Date: Mon, 5 Oct 2020 21:11:46 +0200 Subject: [PATCH 15/23] Fix --- appveyor.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 10ba9090c..160d46564 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -53,6 +53,8 @@ clone_script: Write-Host "[ OK ]" -ForegroundColor Green } + $env:wsl_installed = false + $WSLjob = Start-Job -Name WSLInstall -ScriptBlock { Function WSLExec($Text, $Cmd) { Write-Host "$Text" @@ -68,6 +70,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 + $env:wsl_installed = true } $env:PSInstallTime=[System.Environment]::TickCount @@ -235,9 +238,9 @@ build_script: } #WSL: wait for installation to finish - Receive-Job -Wait -Name WSLInstall -ErrorAction SilentlyContinue - - Add-AppveyorMessage -Message "WSL start" -Category Information + while(!$env:wsl_installed) { + Start-Sleep -s 5 + } #Windows Subsystem for Linux (WSL) Write-Host "---------- WSL make ----------" -ForegroundColor Yellow From 4003f47b6e446c32a261dd7cef756407cd349fe0 Mon Sep 17 00:00:00 2001 From: Gator96100 Date: Mon, 5 Oct 2020 21:47:13 +0200 Subject: [PATCH 16/23] WIP --- appveyor.yml | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 160d46564..9d1da7ef0 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 -> appveyor.yml + - C:\ps-cache environment: proxspace_url: https://github.com/Gator96100/ProxSpace/archive/master.zip proxspace_zip_file: \proxspace.zip @@ -53,9 +53,7 @@ clone_script: Write-Host "[ OK ]" -ForegroundColor Green } - $env:wsl_installed = false - - $WSLjob = Start-Job -Name WSLInstall -ScriptBlock { + $env:WSLInstalljob = Start-Job -Name WSLInstall -ScriptBlock { Function WSLExec($Text, $Cmd) { Write-Host "$Text" wsl -- bash -c $Cmd @@ -70,7 +68,6 @@ 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 - $env:wsl_installed = true } $env:PSInstallTime=[System.Environment]::TickCount @@ -157,7 +154,7 @@ install: } Start-Sleep -s 5 - Receive-Job -Name WSLInstall -ErrorAction SilentlyContinue + Receive-Job -Job $env:WSLInstalljob -ErrorAction SilentlyContinue } #Receive-Job -Wait -Name PSInstall } @@ -238,9 +235,7 @@ build_script: } #WSL: wait for installation to finish - while(!$env:wsl_installed) { - Start-Sleep -s 5 - } + Receive-Job -Job $env:WSLInstalljob -ErrorAction SilentlyContinue #Windows Subsystem for Linux (WSL) Write-Host "---------- WSL make ----------" -ForegroundColor Yellow From bf70999c4e15e086a752990ff2b91cf94c1f2759 Mon Sep 17 00:00:00 2001 From: Gator96100 Date: Mon, 5 Oct 2020 22:06:03 +0200 Subject: [PATCH 17/23] Can't use receive-job withing jobs --- appveyor.yml | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 9d1da7ef0..c8e1f6ee6 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -53,7 +53,9 @@ clone_script: Write-Host "[ OK ]" -ForegroundColor Green } - $env:WSLInstalljob = Start-Job -Name WSLInstall -ScriptBlock { + $env:wsl_install_running = true + + $WSLjob = Start-Job -Name WSLInstall -ScriptBlock { Function WSLExec($Text, $Cmd) { Write-Host "$Text" wsl -- bash -c $Cmd @@ -68,6 +70,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 + $env:wsl_install_running = false } $env:PSInstallTime=[System.Environment]::TickCount @@ -154,7 +157,7 @@ install: } Start-Sleep -s 5 - Receive-Job -Job $env:WSLInstalljob -ErrorAction SilentlyContinue + Receive-Job -Name WSLInstall -ErrorAction SilentlyContinue } #Receive-Job -Wait -Name PSInstall } @@ -235,7 +238,13 @@ build_script: } #WSL: wait for installation to finish - Receive-Job -Job $env:WSLInstalljob -ErrorAction SilentlyContinue + if($env:wsl_install_running){ + Write-Host "Waiting for WSL installation to finish..." + while($env:wsl_install_running) { + Start-Sleep -s 1 + } + Write-Host "$Name [ OK ]" -ForegroundColor Green + } #Windows Subsystem for Linux (WSL) Write-Host "---------- WSL make ----------" -ForegroundColor Yellow @@ -321,6 +330,8 @@ build_script: ExecCheck "PS cmake Tests" + Receive-Job -Wait -Name WSLInstall -ErrorAction SilentlyContinue + Receive-Job -Wait -Job $WSLjob From afe63161b3627a73b05dbb40170a8d4951ad6f85 Mon Sep 17 00:00:00 2001 From: Gator96100 Date: Mon, 5 Oct 2020 22:58:51 +0200 Subject: [PATCH 18/23] WIP --- appveyor.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index c8e1f6ee6..ade2526f0 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -29,7 +29,6 @@ init: $releasename+=$env:APPVEYOR_BUILD_VERSION + " [" + $env:APPVEYOR_REPO_COMMIT_SHORT + "]" - Write-Host "repository: $env:appveyor_repo_name branch:$env:APPVEYOR_REPO_BRANCH release: $releasename" -ForegroundColor Yellow Add-AppveyorMessage -Message "[$env:APPVEYOR_REPO_COMMIT_SHORT]$env:appveyor_repo_name($env:APPVEYOR_REPO_BRANCH)" -Category Information -Details "repository: $env:appveyor_repo_name branch: $env:APPVEYOR_REPO_BRANCH release: $releasename" @@ -239,12 +238,14 @@ build_script: #WSL: wait for installation to finish if($env:wsl_install_running){ - Write-Host "Waiting for WSL installation to finish..." + Write-Host "Waiting for WSL installation to finish..." -NoNewLine while($env:wsl_install_running) { - Start-Sleep -s 1 + Start-Sleep -s 5 } Write-Host "$Name [ OK ]" -ForegroundColor Green } + + Add-AppveyorMessage -Message "WSL start: $env:wsl_install_running" -Category Information #Windows Subsystem for Linux (WSL) Write-Host "---------- WSL make ----------" -ForegroundColor Yellow @@ -333,7 +334,6 @@ build_script: Receive-Job -Wait -Name WSLInstall -ErrorAction SilentlyContinue Receive-Job -Wait -Job $WSLjob - test_script: - ps: >- From afe04ba2227c884db919d7af12a0e94c7f7bb933 Mon Sep 17 00:00:00 2001 From: Gator96100 Date: Mon, 5 Oct 2020 23:35:21 +0200 Subject: [PATCH 19/23] Test --- appveyor.yml | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index ade2526f0..397d36aa2 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -52,8 +52,6 @@ clone_script: Write-Host "[ OK ]" -ForegroundColor Green } - $env:wsl_install_running = true - $WSLjob = Start-Job -Name WSLInstall -ScriptBlock { Function WSLExec($Text, $Cmd) { Write-Host "$Text" @@ -69,7 +67,6 @@ 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 - $env:wsl_install_running = false } $env:PSInstallTime=[System.Environment]::TickCount @@ -237,13 +234,7 @@ build_script: } #WSL: wait for installation to finish - if($env:wsl_install_running){ - Write-Host "Waiting for WSL installation to finish..." -NoNewLine - while($env:wsl_install_running) { - Start-Sleep -s 5 - } - Write-Host "$Name [ OK ]" -ForegroundColor Green - } + Receive-Job -Wait -Job $input -ErrorAction SilentlyContinue Add-AppveyorMessage -Message "WSL start: $env:wsl_install_running" -Category Information @@ -273,7 +264,7 @@ build_script: Write-Host "---------- WSL cmake tests ----------" -ForegroundColor Yellow ExecWSLCmd './tools/pm3_tests.sh --clientbin client/build/proxmark3 client' ExecCheck "WSL cmake Tests" - } + } -InputObject Get-Job -Name WSLInstall #ProxSpace @@ -331,8 +322,6 @@ build_script: ExecCheck "PS cmake Tests" - Receive-Job -Wait -Name WSLInstall -ErrorAction SilentlyContinue - Receive-Job -Wait -Job $WSLjob test_script: From 9b173b01ac2783891bf8a1457c9b4cffb638ff17 Mon Sep 17 00:00:00 2001 From: Gator96100 Date: Mon, 5 Oct 2020 23:45:26 +0200 Subject: [PATCH 20/23] Test --- appveyor.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 397d36aa2..409f5923a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -212,6 +212,8 @@ build_script: } } + $WSLInstalljob = Get-Job -Name WSLInstall + $WSLjob = Start-Job -Name WSLCompile -ScriptBlock { Function ExecWSLCmd($Cmd) { cd $env:wsl_git_path @@ -264,7 +266,7 @@ build_script: Write-Host "---------- WSL cmake tests ----------" -ForegroundColor Yellow ExecWSLCmd './tools/pm3_tests.sh --clientbin client/build/proxmark3 client' ExecCheck "WSL cmake Tests" - } -InputObject Get-Job -Name WSLInstall + } -InputObject $WSLInstalljob #ProxSpace From 42ca4dd8581253bafedb3e64ad41ed74a334e706 Mon Sep 17 00:00:00 2001 From: Gator96100 Date: Tue, 6 Oct 2020 00:00:38 +0200 Subject: [PATCH 21/23] WIP --- appveyor.yml | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 409f5923a..3a9a34b8a 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -52,6 +52,8 @@ 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" @@ -67,6 +69,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 } $env:PSInstallTime=[System.Environment]::TickCount @@ -212,8 +215,6 @@ build_script: } } - $WSLInstalljob = Get-Job -Name WSLInstall - $WSLjob = Start-Job -Name WSLCompile -ScriptBlock { Function ExecWSLCmd($Cmd) { cd $env:wsl_git_path @@ -236,9 +237,15 @@ build_script: } #WSL: wait for installation to finish - Receive-Job -Wait -Job $input -ErrorAction SilentlyContinue + if($global:wsl_install_running){ + Write-Host "Waiting for WSL installation to finish..." -NoNewLine + while($global:wsl_install_running) { + Start-Sleep -s 5 + } + Write-Host "$Name [ OK ]" -ForegroundColor Green + } - Add-AppveyorMessage -Message "WSL start: $env:wsl_install_running" -Category Information + Add-AppveyorMessage -Message "WSL start: $global:wsl_install_running" -Category Information #Windows Subsystem for Linux (WSL) Write-Host "---------- WSL make ----------" -ForegroundColor Yellow @@ -266,7 +273,7 @@ build_script: Write-Host "---------- WSL cmake tests ----------" -ForegroundColor Yellow ExecWSLCmd './tools/pm3_tests.sh --clientbin client/build/proxmark3 client' ExecCheck "WSL cmake Tests" - } -InputObject $WSLInstalljob + } #ProxSpace @@ -324,6 +331,8 @@ build_script: ExecCheck "PS cmake Tests" + Receive-Job -Wait -Name WSLInstall -ErrorAction SilentlyContinue + Receive-Job -Wait -Job $WSLjob test_script: From bba256532f6d5a623e061850c79341ab4ac0703a Mon Sep 17 00:00:00 2001 From: Gator96100 Date: Tue, 6 Oct 2020 00:13:09 +0200 Subject: [PATCH 22/23] Fix --- appveyor.yml | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) 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 From 216d86b604616538669603f85d59eab1a5368994 Mon Sep 17 00:00:00 2001 From: Gator96100 Date: Tue, 6 Oct 2020 01:07:39 +0200 Subject: [PATCH 23/23] Hide output --- appveyor.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 0a04c0d4f..44e6b6040 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -67,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 - New-Item -ItemType "file" -Path "C:\WSL-Finished.txt" -Force + New-Item -ItemType "file" -Path "C:\WSL-Finished.txt" -Force | Out-Null } $env:PSInstallTime=[System.Environment]::TickCount