Skip to content

Commit b624e14

Browse files
committed
Switch to ankane for db setup
1 parent 4a999a5 commit b624e14

File tree

2 files changed

+11
-6
lines changed

2 files changed

+11
-6
lines changed

.github/scripts/windows/test_task.bat

+3-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,9 @@ if %errorlevel% neq 0 exit /b 3
5151

5252
rem setup ODBC related exts
5353
set ODBC_TEST_USER=sa
54-
set ODBC_TEST_PASS=Password12!
54+
if /i "%ODBC_TEST_PASS%" equ "" (
55+
set ODBC_TEST_PASS=Password12!
56+
)
5557
if /i "%APPVEYOR%" equ "True" (
5658
set ODBC_TEST_DSN=Driver={ODBC Driver 13 for SQL Server};Server=^(local^)\SQL2017;Database=master;uid=%ODBC_TEST_USER%;pwd=%ODBC_TEST_PASS%
5759
) else (

.github/workflows/push.yml

+8-5
Original file line numberDiff line numberDiff line change
@@ -173,18 +173,21 @@ jobs:
173173
THREAD_SAFE: "${{ matrix.zts && '1' || '0' }}"
174174
INTRINSICS: "${{ matrix.zts && 'AVX2' || '' }}"
175175
PARALLEL: -j2
176+
ODBC_TEST_PASS: YourStrong!Passw0rd
176177
steps:
177178
- name: git config
178179
run: git config --global core.autocrlf false && git config --global core.eol lf
179180
- name: git checkout
180181
uses: actions/checkout@v2
182+
- name: Install MySQL
183+
uses: ankane/setup-mysql@v1
181184
- name: Setup MySQL
182185
run: |
183-
choco install mysql -y --no-progress --params="/port:3306"
184-
mysql.exe --port=3306 --user=root --password="" -e "ALTER USER 'root'@'localhost' IDENTIFIED BY 'Password12!'; FLUSH PRIVILEGES;"
185-
- name: Setup MSSQL
186-
run: |
187-
choco install sql-server-express -y --no-progress --install-arguments="/SECURITYMODE=SQL /SAPWD=Password12!"
186+
mysql --port=3306 --user=root --password="" -e "ALTER USER 'root'@'localhost' IDENTIFIED BY 'Password12!'; FLUSH PRIVILEGES;"
187+
- name: Install MSSQL
188+
uses: ankane/setup-sqlserver@v1
189+
with:
190+
accept-eula: true
188191
- name: Setup PostgreSQL
189192
run: |
190193
Set-Service -Name "postgresql-x64-14" -StartupType manual -Status Running

0 commit comments

Comments
 (0)