From f087ea78610baeb6b35c0e0507813479915d902e Mon Sep 17 00:00:00 2001 From: Greg Williamson Date: Fri, 31 Jul 2020 14:24:41 -0400 Subject: [PATCH 1/6] Update azure-jobs.yml --- azure-jobs.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/azure-jobs.yml b/azure-jobs.yml index 10f0575cf..4988439a3 100644 --- a/azure-jobs.yml +++ b/azure-jobs.yml @@ -61,6 +61,10 @@ jobs: - script: | set PATH=%CD:~0,2%\msys64\usr\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem + %CD:~0,2%\msys64\usr\bin\curl -O http://repo.msys2.org/msys/x86_64/msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz + %CD:~0,2%\msys64\usr\bin\curl -O http://repo.msys2.org/msys/x86_64/msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz.sig + %CD:~0,2%\msys64\usr\bin\pacman-key --verify msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz.sig + %CD:~0,2%\msys64\usr\bin\pacman --overwrite='*' --noconfirm -U msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz %CD:~0,2%\msys64\usr\bin\pacman --noconfirm -Syyuu displayName: Update MSYS2 From 40e3a974e39eafa100b9a202d5c7d45d990ce46b Mon Sep 17 00:00:00 2001 From: Greg Williamson Date: Fri, 31 Jul 2020 14:33:31 -0400 Subject: [PATCH 2/6] Update azure-jobs.yml --- azure-jobs.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/azure-jobs.yml b/azure-jobs.yml index 4988439a3..9dbb593f9 100644 --- a/azure-jobs.yml +++ b/azure-jobs.yml @@ -70,6 +70,7 @@ jobs: - script: | set PATH=%CD:~0,2%\msys64\usr\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem + %CD:~0,2%\msys64\usr\bin\pacman --noconfirm -Syyuu %CD:~0,2%\msys64\usr\bin\pacman --noconfirm --needed -S git base-devel mingw-w64-$(MINGW_ARCH)-toolchain mingw-w64-$(MINGW_ARCH)-cmake mingw-w64-$(MINGW_ARCH)-nsis mingw-w64-$(MINGW_ARCH)-protobuf mingw-w64-$(MINGW_ARCH)-grpc mingw-w64-$(MINGW_ARCH)-gflags mingw-w64-$(MINGW_ARCH)-yaml-cpp mingw-w64-$(MINGW_ARCH)-pugixml mingw-w64-$(MINGW_ARCH)-rapidjson mingw-w64-$(MINGW_ARCH)-boost mingw-w64-$(MINGW_ARCH)-qt5 mingw-w64-$(MINGW_ARCH)-qscintilla %CD:~0,2%\msys64\usr\bin\pacman --noconfirm -Scc displayName: Install Toolchain From 327c180c7a7cca5af6e92c2327f6172ed773d9de Mon Sep 17 00:00:00 2001 From: Greg Williamson Date: Fri, 31 Jul 2020 14:42:00 -0400 Subject: [PATCH 3/6] Update azure-jobs.yml --- azure-jobs.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/azure-jobs.yml b/azure-jobs.yml index 9dbb593f9..d776b6877 100644 --- a/azure-jobs.yml +++ b/azure-jobs.yml @@ -67,6 +67,8 @@ jobs: %CD:~0,2%\msys64\usr\bin\pacman --overwrite='*' --noconfirm -U msys2-keyring-r21.b39fb11-1-any.pkg.tar.xz %CD:~0,2%\msys64\usr\bin\pacman --noconfirm -Syyuu displayName: Update MSYS2 + + - powershell: Get-Process | Where-Object {$_.path -like '%CD:~0,2%\msys64*'} | Stop-Process - script: | set PATH=%CD:~0,2%\msys64\usr\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem From 437645a509ce64ad6597fb36cd55f3f0406c92a0 Mon Sep 17 00:00:00 2001 From: Greg Williamson Date: Fri, 31 Jul 2020 14:45:35 -0400 Subject: [PATCH 4/6] Update azure-jobs.yml --- azure-jobs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-jobs.yml b/azure-jobs.yml index d776b6877..3ea3f3c73 100644 --- a/azure-jobs.yml +++ b/azure-jobs.yml @@ -68,7 +68,7 @@ jobs: %CD:~0,2%\msys64\usr\bin\pacman --noconfirm -Syyuu displayName: Update MSYS2 - - powershell: Get-Process | Where-Object {$_.path -like '%CD:~0,2%\msys64*'} | Stop-Process + - powershell: Get-Process | Where-Object {$_.path -like '%CD:~0,2%\msys64*'} | Stop-Process - script: | set PATH=%CD:~0,2%\msys64\usr\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem From 2a1a378386a98b47b5e293a1ad0c76813d0a9dda Mon Sep 17 00:00:00 2001 From: Greg Williamson Date: Fri, 31 Jul 2020 14:55:01 -0400 Subject: [PATCH 5/6] Update azure-jobs.yml --- azure-jobs.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-jobs.yml b/azure-jobs.yml index 3ea3f3c73..47110415c 100644 --- a/azure-jobs.yml +++ b/azure-jobs.yml @@ -68,7 +68,7 @@ jobs: %CD:~0,2%\msys64\usr\bin\pacman --noconfirm -Syyuu displayName: Update MSYS2 - - powershell: Get-Process | Where-Object {$_.path -like '%CD:~0,2%\msys64*'} | Stop-Process + - script: taskkill /f /fi "MODULES eq msys-2.0.dll" || exit /b 0s - script: | set PATH=%CD:~0,2%\msys64\usr\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem From 4b56a4bf0905a95093a9855d8b5eed58f221ac81 Mon Sep 17 00:00:00 2001 From: Greg Williamson Date: Fri, 31 Jul 2020 15:20:02 -0400 Subject: [PATCH 6/6] Update azure-jobs.yml --- azure-jobs.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/azure-jobs.yml b/azure-jobs.yml index 47110415c..89504580e 100644 --- a/azure-jobs.yml +++ b/azure-jobs.yml @@ -69,6 +69,7 @@ jobs: displayName: Update MSYS2 - script: taskkill /f /fi "MODULES eq msys-2.0.dll" || exit /b 0s + displayName: Reset MSYS2 - script: | set PATH=%CD:~0,2%\msys64\usr\bin;C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem