Skip to content

Commit d15b532

Browse files
committed
Fix CI
1 parent 24a9e7b commit d15b532

File tree

1 file changed

+21
-13
lines changed

1 file changed

+21
-13
lines changed

.github/workflows/ci.yml

Lines changed: 21 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,16 @@ concurrency:
2121
jobs:
2222
check_and_test:
2323
name: Check
24-
needs: [sqlite_bundled, sqlite_wasm, rustfmt_and_clippy, postgres_bundled, mysql_bundled]
24+
#needs: [sqlite_bundled, sqlite_wasm, rustfmt_and_clippy, postgres_bundled, mysql_bundled]
2525
strategy:
2626
fail-fast: false
2727
matrix:
28-
rust: ["stable", "beta", "nightly"]
29-
backend: ["postgres", "sqlite", "mysql"]
30-
os: [ubuntu-latest, macos-13, macos-15, windows-2019]
28+
rust: ["stable"]
29+
backend: ["postgres", "mysql", "sqlite"]
30+
os: ["windows-2025"]
31+
#rust: ["stable", "beta", "nightly"]
32+
#backend: ["postgres", "sqlite", "mysql"]
33+
#os: [ubuntu-latest, macos-13, macos-15, windows-2019]
3134
runs-on: ${{ matrix.os }}
3235
steps:
3336
- name: Checkout sources
@@ -128,7 +131,7 @@ jobs:
128131
run: |
129132
choco install sqlite
130133
cd /D C:\ProgramData\chocolatey\lib\SQLite\tools
131-
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
134+
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
132135
lib /machine:x64 /def:sqlite3.def /out:sqlite3.lib
133136
134137
- name: Set variables for sqlite (Windows)
@@ -152,25 +155,30 @@ jobs:
152155
153156
- name: Install mysql (Windows)
154157
if: runner.os == 'Windows' && matrix.backend == 'mysql'
155-
shell: cmd
158+
shell: bash
156159
run: |
157-
choco install mysql
158-
"C:\tools\mysql\current\bin\mysql" -e "create database diesel_test; create database diesel_unit_test; grant all on `diesel_%`.* to 'root'@'localhost';" -uroot
160+
mkdir "C:\Program Files\MySQL\MySQL Server 8.0\data\"
161+
"C:\Program Files\MySQL\MySQL Server 8.0\bin\mysqld" --console --initialize --initialize-insecure &
162+
sleep 5
163+
"C:\Program Files\MySQL\MySQL Server 8.0\bin\mysql" -e "create database diesel_test; create database diesel_unit_test; grant all on `diesel_%`.* to 'root'@'localhost';" -uroot
159164
160165
- name: Set variables for mysql (Windows)
161166
if: runner.os == 'Windows' && matrix.backend == 'mysql'
162167
shell: bash
163168
run: |
169+
# remove doxygen because mysqlclient build otherwise breaks?
170+
rm "C:/Strawberry/c/bin/doxygen.exe"
164171
echo "OPENSSL_RUST_USE_NASM=0" >> $GITHUB_ENV
165172
echo OPENSSL_SRC_PERL=C:/Strawberry/perl/bin/perl >> $GITHUB_ENV
166173
echo "MYSQL_DATABASE_URL=mysql://root@127.0.0.1/diesel_test" >> $GITHUB_ENV
167174
echo "MYSQL_EXAMPLE_DATABASE_URL=mysql://root@127.0.0.1/diesel_example" >> $GITHUB_ENV
168175
echo "MYSQL_UNIT_TEST_DATABASE_URL=mysql://root@127.0.0.1/diesel_unit_test" >> $GITHUB_ENV
169-
echo "MYSQLCLIENT_LIB_DIR=C:\tools\mysql\current\lib" >> $GITHUB_ENV
170-
echo "MYSQLCLIENT_VERSION=8.0.31" >> $GITHUB_ENV
171-
echo "C:\tools\mysql\current\lib" >> $GITHUB_PATH
172-
echo "C:\tools\mysql\current\bin" >> $GITHUB_PATH
173-
dir "C:\tools\mysql\current\lib"
176+
echo "MYSQLCLIENT_LIB_DIR=C:\Program Files\MariaDB 10.11\lib" >> $GITHUB_ENV
177+
echo "MYSQLCLIENT_VERSION=10.11.8" >> $GITHUB_ENV
178+
echo "MYSQLCLIENT_LIBNAME=libmariadb" >> $GITHUB_ENV
179+
echo "C:\Program Files\MariaDB 10.11\lib" >> $GITHUB_PATH
180+
echo "C:\Program Files\MariaDB 10.11\bin" >> $GITHUB_PATH
181+
dir "C:\Program Files\MariaDB 10.11\lib"
174182
175183
- name: Install rust toolchain
176184
uses: dtolnay/rust-toolchain@master

0 commit comments

Comments
 (0)