Skip to content

Commit 325a3f3

Browse files
committed
Fix the CI
* Caused by the release of url 2.1.1 See servo/rust-url#579 for details * A mysql release seems to have broken the macos setup, so use a absulute path there
1 parent f5b15e5 commit 325a3f3

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

azure-pipelines.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,15 @@ jobs:
4646
MYSQL_EXAMPLE_DATABASE_URL: mysql://root@localhost/diesel_example
4747
MYSQL_UNIT_TEST_DATABASE_URL: mysql://root@localhost/diesel_unit_test
4848
RUST_TEST_THREADS: 1
49+
MYSQLCLIENT_LIB_DIR: /usr/local/Cellar/mysql/8.0.19/lib
4950
setup:
5051
- bash: |
5152
brew update &&
5253
brew install mysql &&
5354
brew services start mysql &&
5455
brew services stop mysql;sleep 3;brew services start mysql &&
5556
sleep 2 &&
56-
mysql -e "create database diesel_test; create database diesel_unit_test; grant all on \`diesel_%\`.* to 'root'@'localhost';" -uroot
57+
/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
5758
displayName: Install mysql
5859
5960
- template: _build/azure-pipelines-template.yml

diesel_cli/tests/support/project_builder.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ impl Project {
102102

103103
let mut db_url =
104104
url::Url::parse(&env::var_os(var).unwrap().into_string().unwrap()).unwrap();
105-
db_url.set_path(&format!("diesel_{}", &self.name));
105+
db_url.set_path(&format!("/diesel_{}", &self.name));
106106
db_url
107107
}
108108

0 commit comments

Comments
 (0)