From 0a9ec5c8437d4ade5cf2f95e00dc53317712bb07 Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Wed, 29 May 2019 15:08:25 +0200 Subject: [PATCH] Conditions don't apply to scripts --- azure-pipelines.yml | 18 ++---------------- 1 file changed, 2 insertions(+), 16 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index d3c51d73..d12c762e 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -70,17 +70,10 @@ jobs: displayName: Update MSYS2 - 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 --needed -S base-devel libtool mingw-w64-x86_64-toolchain + %CD:~0,2%\msys64\usr\bin\pacman --noconfirm --needed -S base-devel mingw-w64-x86_64-toolchain %CD:~0,2%\msys64\usr\bin\pacman --noconfirm -Scc %CD:~0,2%\msys64\usr\bin\sed -i "s|#CacheDir.*|CacheDir=/c/Users/%USERNAME%/AppData/Local/Temp|g" /etc/pacman.conf displayName: Install Toolchain - - script: | - condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master')) - set PATH=C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;%CD:~0,2%\msys64\usr\bin;%CD:~0,2%\msys64\bin - set MSYS2_ROOT=%CD:~0,2%\msys64 - set MSYSTEM=MINGW64 - %MSYS2_ROOT%\cmd\msystem MINGW64 - %CD:~0,2%\msys64\usr\bin\bash -lc ./autogen.sh - script: | set PATH=C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;%CD:~0,2%\msys64\usr\bin;%CD:~0,2%\msys64\bin set MSYS2_ROOT=%CD:~0,2%\msys64 @@ -112,17 +105,10 @@ jobs: displayName: Update MSYS2 - 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 --needed -S base-devel libtool mingw-w64-i686-toolchain + %CD:~0,2%\msys64\usr\bin\pacman --noconfirm --needed -S base-devel mingw-w64-i686-toolchain %CD:~0,2%\msys64\usr\bin\pacman --noconfirm -Scc %CD:~0,2%\msys64\usr\bin\sed -i "s|#CacheDir.*|CacheDir=/c/Users/%USERNAME%/AppData/Local/Temp|g" /etc/pacman.conf displayName: Install Toolchain - - script: | - condition: and(succeeded(), eq(variables['Build.SourceBranch'], 'refs/heads/master')) - set PATH=C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;%CD:~0,2%\msys64\usr\bin;%CD:~0,2%\msys64\bin - set MSYS2_ROOT=%CD:~0,2%\msys64 - set MSYSTEM=MINGW32 - %MSYS2_ROOT%\cmd\msystem MINGW32 - %CD:~0,2%\msys64\usr\bin\bash -lc ./autogen.sh - script: | set PATH=C:\Windows\system32;C:\Windows;C:\Windows\System32\Wbem;%CD:~0,2%\msys64\usr\bin;%CD:~0,2%\msys64\bin set MSYS2_ROOT=%CD:~0,2%\msys64