norm if CI conds

Author: mvorisek

.github/workflows/push.yml

@@ -108,9 +108,7 @@ jobs:
     steps:
       - name: git checkout
         uses: actions/checkout@v2
-      - name: DEBUG list env
-        run: gci env:* | sort-object name
-      - name: build
+      - name: Build
         run: appveyor/build.bat
-      - name: test
+      - name: Test
         run: appveyor/test.bat

appveyor/build_task.bat

@@ -1,27 +1,29 @@
 @echo on
 
-if "%APPVEYOR%" equ "True" rmdir /s /q C:\cygwin >NUL 2>NUL
-if %errorlevel% neq 0 exit /b 3
-if "%APPVEYOR%" equ "True" rmdir /s /q C:\cygwin64 >NUL 2>NUL
-if %errorlevel% neq 0 exit /b 3
-if "%APPVEYOR%" equ "True" rmdir /s /q C:\mingw >NUL 2>NUL
-if %errorlevel% neq 0 exit /b 3
-if "%APPVEYOR%" equ "True" rmdir /s /q C:\mingw-w64 >NUL 2>NUL
-if %errorlevel% neq 0 exit /b 3
-if "%APPVEYOR%" equ "True" rmdir /s /q C:\msys64 >NUL 2>NUL
-if %errorlevel% neq 0 exit /b 3
-if "%APPVEYOR%" equ "True" rmdir /s /q c:\OpenSSL-Win32 >NUL 2>NUL
-if %errorlevel% neq 0 exit /b 3
-if "%APPVEYOR%" equ "True" rmdir /s /q c:\OpenSSL-Win64 >NUL 2>NUL
-if %errorlevel% neq 0 exit /b 3
-if "%APPVEYOR%" equ "True" rmdir /s /q c:\OpenSSL-v11-Win32 >NUL 2>NUL
-if %errorlevel% neq 0 exit /b 3
-if "%APPVEYOR%" equ "True" rmdir /s /q c:\OpenSSL-v11-Win64 >NUL 2>NUL
-if %errorlevel% neq 0 exit /b 3
-if "%APPVEYOR%" equ "True" del /f /q C:\Windows\System32\libcrypto-1_1-x64.dll >NUL 2>NUL
-if %errorlevel% neq 0 exit /b 3
-if "%APPVEYOR%" equ "True" del /f /q C:\Windows\System32\libssl-1_1-x64.dll >NUL 2>NUL
-if %errorlevel% neq 0 exit /b 3
+if "%APPVEYOR%" equ "True" (
+    rmdir /s /q C:\cygwin >NUL 2>NUL
+    if %errorlevel% neq 0 exit /b 3
+    rmdir /s /q C:\cygwin64 >NUL 2>NUL
+    if %errorlevel% neq 0 exit /b 3
+    rmdir /s /q C:\mingw >NUL 2>NUL
+    if %errorlevel% neq 0 exit /b 3
+    rmdir /s /q C:\mingw-w64 >NUL 2>NUL
+    if %errorlevel% neq 0 exit /b 3
+    rmdir /s /q C:\msys64 >NUL 2>NUL
+    if %errorlevel% neq 0 exit /b 3
+    rmdir /s /q c:\OpenSSL-Win32 >NUL 2>NUL
+    if %errorlevel% neq 0 exit /b 3
+    rmdir /s /q c:\OpenSSL-Win64 >NUL 2>NUL
+    if %errorlevel% neq 0 exit /b 3
+    rmdir /s /q c:\OpenSSL-v11-Win32 >NUL 2>NUL
+    if %errorlevel% neq 0 exit /b 3
+    rmdir /s /q c:\OpenSSL-v11-Win64 >NUL 2>NUL
+    if %errorlevel% neq 0 exit /b 3
+    del /f /q C:\Windows\System32\libcrypto-1_1-x64.dll >NUL 2>NUL
+    if %errorlevel% neq 0 exit /b 3
+    del /f /q C:\Windows\System32\libssl-1_1-x64.dll >NUL 2>NUL
+    if %errorlevel% neq 0 exit /b 3
+)
 
 cd /D %APPVEYOR_BUILD_FOLDER%
 if %errorlevel% neq 0 exit /b 3

appveyor/test_task.bat

@@ -49,8 +49,10 @@ if "%APPVEYOR%" equ "True" (
 )
 
 rem prepare for ext/openssl
-if "%APPVEYOR%" equ "True" rmdir /s /q C:\OpenSSL-Win32 >NUL 2>NUL
-if "%APPVEYOR%" equ "True" rmdir /s /q C:\OpenSSL-Win64 >NUL 2>NUL
+if "%APPVEYOR%" equ "True" (
+    rmdir /s /q C:\OpenSSL-Win32 >NUL 2>NUL
+    rmdir /s /q C:\OpenSSL-Win64 >NUL 2>NUL
+)
 if "%PLATFORM%" == "x64" (
 	set OPENSSLDIR="C:\Program Files\Common Files\SSL"
 ) else (
@@ -118,12 +120,13 @@ nmake test TESTS="%OPCACHE_OPTS% -q --offline --show-diff --show-slow 1000 --set
 
 set EXIT_CODE=%errorlevel%
 
-appveyor PushArtifact %TEST_PHP_JUNIT%
+if "%APPVEYOR%" equ "True" (
+    appveyor PushArtifact %TEST_PHP_JUNIT%
 
-if %EXIT_CODE% GEQ 1 (
-	git checkout ext\pgsql\tests\config.inc
-	git diff > bless_tests.patch
-	appveyor PushArtifact bless_tests.patch
-)
+    if %EXIT_CODE% GEQ 1 (
+	    git checkout ext\pgsql\tests\config.inc
+    	git diff > bless_tests.patch
+    	appveyor PushArtifact bless_tests.patch
+    )
 
 exit /b %EXIT_CODE%