Skip to content

Commit ccd6000

Browse files
committed
Try to fix ci (second round)
1 parent 2691f6f commit ccd6000

File tree

1 file changed

+6
-15
lines changed

1 file changed

+6
-15
lines changed

.github/workflows/ci.yml

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -56,26 +56,22 @@ jobs:
5656
sudo service postgresql restart && sleep 3
5757
sudo -u postgres psql -c "ALTER USER postgres PASSWORD 'postgres';"
5858
sudo service postgresql restart && sleep 3
59-
echo "PG_DATABASE_URL=postgres://postgres:postgres@localhost/" >> $GITHUB_ENV
60-
echo "PG_EXAMPLE_DATABASE_URL=postgres://postgres:postgres@localhost/diesel_example" >> $GITHUB_ENV
59+
echo "DATABASE_URL=postgres://postgres:postgres@localhost/" >> $GITHUB_ENV
6160
6261
- name: Install mysql (Linux)
6362
if: runner.os == 'Linux' && matrix.backend == 'mysql'
6463
run: |
6564
sudo systemctl start mysql.service
6665
mysql -e "create database diesel_test; create database diesel_unit_test; grant all on \`diesel_%\`.* to 'root'@'localhost';" -uroot -proot
67-
echo "MYSQL_DATABASE_URL=mysql://root:root@localhost/diesel_test" >> $GITHUB_ENV
68-
echo "MYSQL_EXAMPLE_DATABASE_URL=mysql://root:root@localhost/diesel_example" >> $GITHUB_ENV
69-
echo "MYSQL_UNIT_TEST_DATABASE_URL=mysql://root:root@localhost/diesel_unit_test" >> $GITHUB_ENV
66+
echo "DATABASE_URL=mysql://root:root@localhost/diesel_test" >> $GITHUB_ENV
7067
7168
- name: Install postgres (MacOS)
7269
if: runner.os == 'macOS' && matrix.backend == 'postgres'
7370
run: |
7471
/usr/local/opt/postgres/bin/pg_ctl -D /usr/local/var/postgres start
7572
sleep 3
7673
/usr/local/opt/postgres/bin/createuser -s postgres
77-
echo "PG_DATABASE_URL=postgres://postgres@localhost/" >> $GITHUB_ENV
78-
echo "PG_EXAMPLE_DATABASE_URL=postgres://postgres@localhost/diesel_example" >> $GITHUB_ENV
74+
echo "DATABASE_URL=postgres://postgres@localhost/" >> $GITHUB_ENV
7975
8076
- name: Install mysql (MacOS)
8177
if: runner.os == 'macOS' && matrix.backend == 'mysql'
@@ -86,9 +82,7 @@ jobs:
8682
/usr/local/opt/[email protected]/bin/mysql.server start
8783
sleep 3
8884
/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
89-
echo "MYSQL_DATABASE_URL=mysql://runner@localhost/diesel_test" >> $GITHUB_ENV
90-
echo "MYSQL_EXAMPLE_DATABASE_URL=mysql://runner@localhost/diesel_example" >> $GITHUB_ENV
91-
echo "MYSQL_UNIT_TEST_DATABASE_URL=mysql://runner@localhost/diesel_unit_test" >> $GITHUB_ENV
85+
echo "DATABASE_URL=mysql://runner@localhost/diesel_test" >> $GITHUB_ENV
9286
9387
- name: Install postgres (Windows)
9488
if: runner.os == 'Windows' && matrix.backend == 'postgres'
@@ -97,8 +91,7 @@ jobs:
9791
choco install postgresql12 --force --params '/Password:root'
9892
echo "C:\Program Files\PostgreSQL\12\bin" >> $GITHUB_PATH
9993
echo "C:\Program Files\PostgreSQL\12\lib" >> $GITHUB_PATH
100-
echo "PG_DATABASE_URL=postgres://postgres:root@localhost/" >> $GITHUB_ENV
101-
echo "PG_EXAMPLE_DATABASE_URL=postgres://postgres:root@localhost/diesel_example" >> $GITHUB_ENV
94+
echo "DATABASE_URL=postgres://postgres:root@localhost/" >> $GITHUB_ENV
10295
10396
- name: Install mysql (Windows)
10497
if: runner.os == 'Windows' && matrix.backend == 'mysql'
@@ -111,9 +104,7 @@ jobs:
111104
if: runner.os == 'Windows' && matrix.backend == 'mysql'
112105
shell: bash
113106
run: |
114-
echo "MYSQL_DATABASE_URL=mysql://root@localhost/diesel_test" >> $GITHUB_ENV
115-
echo "MYSQL_EXAMPLE_DATABASE_URL=mysql://root@localhost/diesel_example" >> $GITHUB_ENV
116-
echo "MYSQL_UNIT_TEST_DATABASE_URL=mysql://root@localhost/diesel_unit_test" >> $GITHUB_ENV
107+
echo "DATABASE_URL=mysql://root@localhost/diesel_test" >> $GITHUB_ENV
117108
118109
- name: Install rust toolchain
119110
uses: actions-rs/toolchain@v1

0 commit comments

Comments
 (0)