Skip to content

Commit 2bbd81e

Browse files
committed
Update some database installations on ci
1 parent 056dd7b commit 2bbd81e

File tree

1 file changed

+8
-9
lines changed

1 file changed

+8
-9
lines changed

.github/workflows/ci.yml

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -77,20 +77,19 @@ jobs:
7777
if: runner.os == 'macOS' && matrix.backend == 'mysql'
7878
run: |
7979
brew update
80-
brew install mariadb@10.5
81-
/usr/local/opt/mariadb@10.5/bin/mysql_install_db
82-
/usr/local/opt/mariadb@10.5/bin/mysql.server start
80+
brew install mariadb@10.8
81+
/usr/local/opt/mariadb@10.8/bin/mysql_install_db
82+
/usr/local/opt/mariadb@10.8/bin/mysql.server start
8383
sleep 3
84-
/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
85-
echo "DATABASE_URL=mysql://runner@localhost/diesel_test" >> $GITHUB_ENV
84+
/usr/local/opt/[email protected]/bin/mysql -e "ALTER USER 'runner'@'localhost' IDENTIFIED BY 'diesel';" -urunner
85+
/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 -pdiesel
86+
echo "DATABASE_URL=mysql://runner:diesel@localhost/diesel_test" >> $GITHUB_ENV
8687
8788
- name: Install postgres (Windows)
8889
if: runner.os == 'Windows' && matrix.backend == 'postgres'
8990
shell: bash
9091
run: |
91-
choco install postgresql12 --force --params '/Password:root'
92-
echo "C:\Program Files\PostgreSQL\12\bin" >> $GITHUB_PATH
93-
echo "C:\Program Files\PostgreSQL\12\lib" >> $GITHUB_PATH
92+
choco install postgresql14 --force --params '/Password:root'
9493
echo "DATABASE_URL=postgres://postgres:root@localhost/" >> $GITHUB_ENV
9594
9695
- name: Install mysql (Windows)
@@ -130,7 +129,7 @@ jobs:
130129
- uses: actions/checkout@v2
131130
- uses: actions-rs/toolchain@v1
132131
with:
133-
toolchain: 1.54.0
132+
toolchain: stable
134133
profile: minimal
135134
components: clippy, rustfmt
136135
override: true

0 commit comments

Comments
 (0)