Skip to content

Commit

Permalink
Fix CI
Browse files Browse the repository at this point in the history
  • Loading branch information
weiznich committed Jan 24, 2025
1 parent 24a9e7b commit f969f12
Showing 1 changed file with 23 additions and 12 deletions.
35 changes: 23 additions & 12 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,16 @@ concurrency:
jobs:
check_and_test:
name: Check
needs: [sqlite_bundled, sqlite_wasm, rustfmt_and_clippy, postgres_bundled, mysql_bundled]
#needs: [sqlite_bundled, sqlite_wasm, rustfmt_and_clippy, postgres_bundled, mysql_bundled]
strategy:
fail-fast: false
matrix:
rust: ["stable", "beta", "nightly"]
backend: ["postgres", "sqlite", "mysql"]
os: [ubuntu-latest, macos-13, macos-15, windows-2019]
rust: ["stable"]
backend: ["postgres", "mysql", "sqlite"]
os: ["windows-2025"]
#rust: ["stable", "beta", "nightly"]
#backend: ["postgres", "sqlite", "mysql"]
#os: [ubuntu-latest, macos-13, macos-15, windows-2019]
runs-on: ${{ matrix.os }}
steps:
- name: Checkout sources
Expand Down Expand Up @@ -128,7 +131,7 @@ jobs:
run: |
choco install sqlite
cd /D C:\ProgramData\chocolatey\lib\SQLite\tools
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvars64.bat"
lib /machine:x64 /def:sqlite3.def /out:sqlite3.lib
- name: Set variables for sqlite (Windows)
Expand All @@ -154,23 +157,31 @@ jobs:
if: runner.os == 'Windows' && matrix.backend == 'mysql'
shell: cmd
run: |
choco install mysql
"C:\tools\mysql\current\bin\mysql" -e "create database diesel_test; create database diesel_unit_test; grant all on `diesel_%`.* to 'root'@'localhost';" -uroot
dir "C:\Program Files\MySQL\"
dir "C:\Program Files\MySQL\bin"
dir "C:\Program Files\MySQL\lib"
msiexec /qn /i mysql-installer.msi
dir "C:\Program Files\MariaDB 10.11\bin"
dir "C:\Program Files\MariaDB 10.11\"
"C:\Program Files\MySQL\bin\mysql" -e "create database diesel_test; create database diesel_unit_test; grant all on `diesel_%`.* to 'root'@'localhost';" -uroot
- name: Set variables for mysql (Windows)
if: runner.os == 'Windows' && matrix.backend == 'mysql'
shell: bash
run: |
# remove doxygen because mysqlclient build otherwise breaks?
rm "C:/Strawberry/c/bin/doxygen.exe"
echo "OPENSSL_RUST_USE_NASM=0" >> $GITHUB_ENV
echo OPENSSL_SRC_PERL=C:/Strawberry/perl/bin/perl >> $GITHUB_ENV
echo "MYSQL_DATABASE_URL=mysql://root@127.0.0.1/diesel_test" >> $GITHUB_ENV
echo "MYSQL_EXAMPLE_DATABASE_URL=mysql://root@127.0.0.1/diesel_example" >> $GITHUB_ENV
echo "MYSQL_UNIT_TEST_DATABASE_URL=mysql://root@127.0.0.1/diesel_unit_test" >> $GITHUB_ENV
echo "MYSQLCLIENT_LIB_DIR=C:\tools\mysql\current\lib" >> $GITHUB_ENV
echo "MYSQLCLIENT_VERSION=8.0.31" >> $GITHUB_ENV
echo "C:\tools\mysql\current\lib" >> $GITHUB_PATH
echo "C:\tools\mysql\current\bin" >> $GITHUB_PATH
dir "C:\tools\mysql\current\lib"
echo "MYSQLCLIENT_LIB_DIR=C:\Program Files\MariaDB 10.11\lib" >> $GITHUB_ENV
echo "MYSQLCLIENT_VERSION=10.11.8" >> $GITHUB_ENV
echo "MYSQLCLIENT_LIBNAME=libmariadb" >> $GITHUB_ENV
echo "C:\Program Files\MariaDB 10.11\lib" >> $GITHUB_PATH
echo "C:\Program Files\MariaDB 10.11\bin" >> $GITHUB_PATH
dir "C:\Program Files\MariaDB 10.11\lib"
- name: Install rust toolchain
uses: dtolnay/rust-toolchain@master
Expand Down

0 comments on commit f969f12

Please sign in to comment.