Merge pull request #2267 from weiznich/fix/ci

Fix the CI
diesel-rs · Jan 15, 2020 · 20fb020 · 20fb020
2 parents f5b15e5 + 325a3f3
commit 20fb020
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -46,14 +46,15 @@ jobs:
       MYSQL_EXAMPLE_DATABASE_URL: mysql://root@localhost/diesel_example
       MYSQL_UNIT_TEST_DATABASE_URL: mysql://root@localhost/diesel_unit_test
       RUST_TEST_THREADS: 1
+      MYSQLCLIENT_LIB_DIR: /usr/local/Cellar/mysql/8.0.19/lib
     setup:
       - bash: |
           brew update &&
           brew install mysql &&
           brew services start mysql &&
           brew services stop mysql;sleep 3;brew services start mysql &&
           sleep 2 &&
-          mysql -e "create database diesel_test; create database diesel_unit_test; grant all on \`diesel_%\`.* to 'root'@'localhost';" -uroot
+          /usr/local/Cellar/mysql/8.0.19/bin/mysql -e "create database diesel_test; create database diesel_unit_test; grant all on \`diesel_%\`.* to 'root'@'localhost';" -uroot
         displayName: Install mysql
 
 - template: _build/azure-pipelines-template.yml

diff --git a/diesel_cli/tests/support/project_builder.rs b/diesel_cli/tests/support/project_builder.rs
@@ -102,7 +102,7 @@ impl Project {
 
         let mut db_url =
             url::Url::parse(&env::var_os(var).unwrap().into_string().unwrap()).unwrap();
-        db_url.set_path(&format!("diesel_{}", &self.name));
+        db_url.set_path(&format!("/diesel_{}", &self.name));
         db_url
     }