Skip to content

Commit 5e0eb73

Browse files
mvorisekmvorisek
committed
workaround early var expansion inside if block
1 parent 5890e99 commit 5e0eb73

File tree

2 files changed

+44
-56
lines changed

2 files changed

+44
-56
lines changed

‎.github/scripts/windows/build_task.bat

Lines changed: 21 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -5,31 +5,27 @@ if /i "%APPVEYOR%%GITHUB_ACTIONS%" neq "True" (
55
exit /b 3
66
)
77

8-
if /i "%APPVEYOR%" equ "True" (
9-
rmdir /s /q C:\cygwin >NUL 2>NUL
10-
if %errorlevel% neq 0 exit /b 3
11-
rmdir /s /q C:\cygwin64 >NUL 2>NUL
12-
if %errorlevel% neq 0 exit /b 3
13-
rmdir /s /q C:\mingw >NUL 2>NUL
14-
if %errorlevel% neq 0 exit /b 3
15-
rmdir /s /q C:\mingw-w64 >NUL 2>NUL
16-
if %errorlevel% neq 0 exit /b 3
17-
rmdir /s /q C:\msys64 >NUL 2>NUL
18-
if %errorlevel% neq 0 exit /b 3
19-
rmdir /s /q c:\OpenSSL-Win32 >NUL 2>NUL
20-
if %errorlevel% neq 0 exit /b 3
21-
rmdir /s /q c:\OpenSSL-Win64 >NUL 2>NUL
22-
if %errorlevel% neq 0 exit /b 3
23-
rmdir /s /q c:\OpenSSL-v11-Win32 >NUL 2>NUL
24-
if %errorlevel% neq 0 exit /b 3
25-
rmdir /s /q c:\OpenSSL-v11-Win64 >NUL 2>NUL
26-
if %errorlevel% neq 0 exit /b 3
27-
)
28-
if /i "%GITHUB_ACTIONS%" equ "True" (
29-
rem rmdir takes several minutes rename instead only
30-
ren "C:\msys64" "C:\trash-msys64"
31-
if %errorlevel% neq 0 exit /b 3
32-
)
8+
if /i "%APPVEYOR%" equ "True" rmdir /s /q C:\cygwin >NUL 2>NUL
9+
if %errorlevel% neq 0 exit /b 3
10+
if /i "%APPVEYOR%" equ "True" rmdir /s /q C:\cygwin64 >NUL 2>NUL
11+
if %errorlevel% neq 0 exit /b 3
12+
if /i "%APPVEYOR%" equ "True" rmdir /s /q C:\mingw >NUL 2>NUL
13+
if %errorlevel% neq 0 exit /b 3
14+
if /i "%APPVEYOR%" equ "True" rmdir /s /q C:\mingw-w64 >NUL 2>NUL
15+
if %errorlevel% neq 0 exit /b 3
16+
if /i "%APPVEYOR%" equ "True" rmdir /s /q C:\msys64 >NUL 2>NUL
17+
if %errorlevel% neq 0 exit /b 3
18+
if /i "%APPVEYOR%" equ "True" rmdir /s /q c:\OpenSSL-Win32 >NUL 2>NUL
19+
if %errorlevel% neq 0 exit /b 3
20+
if /i "%APPVEYOR%" equ "True" rmdir /s /q c:\OpenSSL-Win64 >NUL 2>NUL
21+
if %errorlevel% neq 0 exit /b 3
22+
if /i "%APPVEYOR%" equ "True" rmdir /s /q c:\OpenSSL-v11-Win32 >NUL 2>NUL
23+
if %errorlevel% neq 0 exit /b 3
24+
if /i "%APPVEYOR%" equ "True" rmdir /s /q c:\OpenSSL-v11-Win64 >NUL 2>NUL
25+
if %errorlevel% neq 0 exit /b 3
26+
rem rmdir takes several minutes rename instead only
27+
if /i "%GITHUB_ACTIONS%" equ "True" ren "C:\msys64" "C:\trash-msys64"
28+
if %errorlevel% neq 0 exit /b 3
3329
del /f /q C:\Windows\System32\libcrypto-1_1-x64.dll >NUL 2>NUL
3430
if %errorlevel% neq 0 exit /b 3
3531
del /f /q C:\Windows\System32\libssl-1_1-x64.dll >NUL 2>NUL

‎.github/scripts/windows/test_task.bat

Lines changed: 23 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -27,53 +27,45 @@ if /i "%APPVEYOR%" equ "True" (
2727
set MYSQL_TEST_PORT=3306
2828
set MYSQL_TEST_USER=root
2929
set MYSQL_TEST_PASSWD=Password12!
30-
set PDO_MYSQL_TEST_HOST=%MYSQL_TEST_HOST%
31-
set PDO_MYSQL_TEST_PORT=%MYSQL_TEST_PORT%
32-
set PDO_MYSQL_TEST_USER=%MYSQL_TEST_USER%
33-
set PDO_MYSQL_TEST_PASS=%MYSQL_TEST_PASSWD%
34-
set PDO_MYSQL_TEST_DSN=mysql:host=%PDO_MYSQL_TEST_HOST%;port=%PDO_MYSQL_TEST_PORT%;dbname=test
35-
"C:\Program Files\MySql\MySQL Server 5.7\bin\mysql.exe" --user=%MYSQL_TEST_USER% -e "CREATE DATABASE IF NOT EXISTS test"
36-
if %errorlevel% neq 0 exit /b 3
37-
3830
set PGUSER=postgres
3931
set PGPASSWORD=Password12!
40-
rem set PGSQL_TEST_CONNSTR=host=127.0.0.1 dbname=test port=5432 user=postgres password=Password12!
41-
echo ^<?php $conn_str = "host=127.0.0.1 dbname=test port=5432 user=%PGUSER% password=%PGPASSWORD%"; ?^> >> ext\pgsql\tests\config.inc
42-
set PDO_PGSQL_TEST_DSN=pgsql:host=127.0.0.1 port=5432 dbname=test user=%PGUSER% password=%PGPASSWORD%
43-
"C:\Program Files\PostgreSQL\10\bin\createdb.exe" test
44-
if %errorlevel% neq 0 exit /b 3
45-
4632
set ODBC_TEST_USER=sa
4733
set ODBC_TEST_PASS=Password12!
48-
set ODBC_TEST_DSN=Driver={ODBC Driver 13 for SQL Server};Server=^(local^)\SQL2017;Database=master;uid=%ODBC_TEST_USER%;pwd=%ODBC_TEST_PASS%
49-
set PDOTEST_DSN=odbc:%ODBC_TEST_DSN%
5034
)
5135
if /i "%GITHUB_ACTIONS%" equ "True" (
5236
set MYSQL_TEST_HOST=127.0.0.1
5337
set MYSQL_TEST_PORT=3307
5438
set MYSQL_TEST_USER=root
5539
set MYSQL_TEST_PASSWD=mysql_Pass11
56-
set PDO_MYSQL_TEST_HOST=%MYSQL_TEST_HOST%
57-
set PDO_MYSQL_TEST_PORT=%MYSQL_TEST_PORT%
58-
set PDO_MYSQL_TEST_USER=%MYSQL_TEST_USER%
59-
set PDO_MYSQL_TEST_PASS=%MYSQL_TEST_PASSWD%
60-
set PDO_MYSQL_TEST_DSN=mysql:host=%PDO_MYSQL_TEST_HOST%;port=%PDO_MYSQL_TEST_PORT%;dbname=test
61-
mysql --user=%MYSQL_TEST_USER% -e "CREATE DATABASE IF NOT EXISTS test"
62-
if %errorlevel% neq 0 exit /b 3
63-
6440
set PGUSER=postgres
6541
set PGPASSWORD=postgresql_Pass11
66-
rem set PGSQL_TEST_CONNSTR=host=127.0.0.1 dbname=test port=5432 user=%PGUSER% password=%PGPASSWORD%
67-
echo ^<?php $conn_str = "host=127.0.0.1 dbname=test port=5432 user=%PGUSER% password=%PGPASSWORD%"; ?^> >> ext\pgsql\tests\config.inc
68-
set PDO_PGSQL_TEST_DSN=pgsql:host=127.0.0.1 port=5432 dbname=test user=%PGUSER% password=%PGPASSWORD%
69-
"%PGBIN%\createdb.exe" test
70-
if %errorlevel% neq 0 exit /b 3
71-
7242
set ODBC_TEST_USER=sa
7343
set ODBC_TEST_PASS=mssql_Pass11
44+
)
45+
set PDO_MYSQL_TEST_HOST=%MYSQL_TEST_HOST%
46+
set PDO_MYSQL_TEST_PORT=%MYSQL_TEST_PORT%
47+
set PDO_MYSQL_TEST_USER=%MYSQL_TEST_USER%
48+
set PDO_MYSQL_TEST_PASS=%MYSQL_TEST_PASSWD%
49+
set PDO_MYSQL_TEST_DSN=mysql:host=%PDO_MYSQL_TEST_HOST%;port=%PDO_MYSQL_TEST_PORT%;dbname=test
50+
rem set PGSQL_TEST_CONNSTR=host=127.0.0.1 dbname=test port=5432 user=%PGUSER% password=%PGPASSWORD%
51+
echo ^<?php $conn_str = "host=127.0.0.1 dbname=test port=5432 user=%PGUSER% password=%PGPASSWORD%"; ?^> >> ext\pgsql\tests\config.inc
52+
set PDO_PGSQL_TEST_DSN=pgsql:host=127.0.0.1 port=5432 dbname=test user=%PGUSER% password=%PGPASSWORD%
53+
if /i "%APPVEYOR%" equ "True" (
54+
set ODBC_TEST_DSN=Driver={ODBC Driver 13 for SQL Server};Server=^(local^)\SQL2017;Database=master;uid=%ODBC_TEST_USER%;pwd=%ODBC_TEST_PASS%
55+
set TMP_MYSQL_BIN=%ProgramFiles%\MySql\MySQL Server 5.7\bin
56+
set TMP_POSTGRESQL_BIN=%ProgramFiles%\PostgreSQL\10\bin
57+
)
58+
if /i "%GITHUB_ACTIONS%" equ "True" (
7459
set ODBC_TEST_DSN=Driver={ODBC Driver 13 for SQL Server};Server=^(local^)\SQLEXPRESS;Database=master;uid=%ODBC_TEST_USER%;pwd=%ODBC_TEST_PASS%
75-
set PDOTEST_DSN=odbc:%ODBC_TEST_DSN%
60+
set TMP_MYSQL_BIN=C:\mysql\bin
61+
set TMP_POSTGRESQL_BIN=%PGBIN%
7662
)
63+
set PDOTEST_DSN=odbc:%ODBC_TEST_DSN%
64+
65+
"%TMP_MYSQL_BIN%\mysql.exe" --host=%PDO_MYSQL_TEST_HOST% --port=%MYSQL_TEST_PORT% --user=%MYSQL_TEST_USER% --password=%MYSQL_TEST_PASSWD% -e "CREATE DATABASE IF NOT EXISTS test"
66+
if %errorlevel% neq 0 exit /b 3
67+
"%TMP_POSTGRESQL_BIN%\createdb.exe" test
68+
if %errorlevel% neq 0 exit /b 3
7769

7870
rem prepare for ext/openssl
7971
rmdir /s /q C:\OpenSSL-Win32 >NUL 2>NUL

0 commit comments

Comments
 (0)