Skip to content

Commit 4e03688

Browse files
committed
Another round of CI config fixes
1 parent 2c3b63e commit 4e03688

File tree

1 file changed

+14
-12
lines changed

1 file changed

+14
-12
lines changed

.github/workflows/ci.yml

+14-12
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222
matrix:
2323
rust: ["stable", "beta", "nightly"]
2424
backend: ["postgres", "mysql", "sqlite"]
25-
os: [ubuntu-latest, macos-latest, macos-14, windows-latest]
25+
os: [ubuntu-latest, macos-latest, macos-14, windows-2019]
2626
runs-on: ${{ matrix.os }}
2727
steps:
2828
- name: Checkout sources
@@ -125,23 +125,25 @@ jobs:
125125
- name: Install mysql (MacOS)
126126
if: matrix.os == 'macos-latest' && matrix.backend == 'mysql'
127127
run: |
128-
brew install mariadb@10.5
129-
/usr/local/opt/mariadb@10.5/bin/mysql_install_db
130-
/usr/local/opt/mariadb@10.5/bin/mysql.server start
128+
brew install mariadb@11.3
129+
/usr/local/opt/mariadb@11.3/bin/mysql_install_db
130+
/usr/local/opt/mariadb@11.3/bin/mysql.server start
131131
sleep 3
132-
/usr/local/opt/[email protected]/bin/mysql -e "create database diesel_test; create database diesel_unit_test; grant all on \`diesel_%\`.* to 'runner'@'localhost';" -urunner
133-
echo "DATABASE_URL=mysql://runner@localhost/diesel_test" >> $GITHUB_ENV
132+
/usr/local/opt/[email protected]/bin/mysqladmin -u runner password diesel
133+
/usr/local/opt/[email protected]/bin/mysql -e "create database diesel_test; create database diesel_unit_test; grant all on \`diesel_%\`.* to 'runner'@'localhost';" -urunner
134+
echo "DATABASE_URL=mysql://runner:diesel@localhost/diesel_test" >> $GITHUB_ENV
134135
135136
- name: Install mysql (MacOS M1)
136137
if: matrix.os == 'macos-14' && matrix.backend == 'mysql'
137138
run: |
138-
brew install mariadb@10.5
139-
ls /opt/homebrew/opt/mariadb@10.5
140-
/opt/homebrew/opt/mariadb@10.5/bin/mysql_install_db
141-
/opt/homebrew/opt/mariadb@10.5/bin/mysql.server start
139+
brew install mariadb@11.3
140+
ls /opt/homebrew/opt/mariadb@11.3
141+
/opt/homebrew/opt/mariadb@11.3/bin/mysql_install_db
142+
/opt/homebrew/opt/mariadb@11.3/bin/mysql.server start
142143
sleep 3
143-
/opt/homebrew/opt/[email protected]/bin/mysql -e "create database diesel_test; create database diesel_unit_test; grant all on \`diesel_%\`.* to 'runner'@'localhost';" -urunner
144-
echo "DATABASE_URL=mysql://runner@localhost/diesel_test" >> $GITHUB_ENV
144+
/opt/homebrew/opt/[email protected]/bin/mysqladmin -u runner password diesel
145+
/opt/homebrew/opt/[email protected]/bin/mysql -e "create database diesel_test; create database diesel_unit_test; grant all on \`diesel_%\`.* to 'runner'@'localhost';" -urunner
146+
echo "DATABASE_URL=mysql://runner:diesel@localhost/diesel_test" >> $GITHUB_ENV
145147
146148
- name: Install postgres (Windows)
147149
if: runner.os == 'Windows' && matrix.backend == 'postgres'

0 commit comments

Comments
 (0)