Skip to content

Commit

Permalink
Merge pull request #49 from hackerchai/master
Browse files Browse the repository at this point in the history
Feat: bump version 0.8.1
  • Loading branch information
hackerchai authored Sep 27, 2020
2 parents 7337d96 + 8a7448a commit 8fb219a
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 21 deletions.
22 changes: 11 additions & 11 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,21 +24,21 @@ jobs:
- 5432:5432
options: --health-cmd pg_isready --health-interval 10s --health-timeout 5s --health-retries 5

mysql:
image: mysql:8.0
env:
MYSQL_DATABASE: casbin
MYSQL_USER: casbin_rs
MYSQL_PASSWORD: casbin_rs
MYSQL_ROOT_PASSWORD: root
ports:
- 3306:3306
options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3

steps:
- name: Checkout Repository
uses: actions/checkout@master

- name: Shutdown Ubuntu MySQL (SUDO)
run: sudo service mysql stop

- name: Set Up MySQL
uses: mirromutth/mysql-action@v1.1
with:
mysql version: '8.0'
mysql database: 'casbin'
mysql user: 'casbin_rs'
mysql password: 'casbin_rs'

- name: Install Rust toolchain
uses: actions-rs/toolchain@v1
with:
Expand Down
14 changes: 7 additions & 7 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "diesel-adapter"
version = "0.8.0"
version = "0.8.1"
authors = ["Cheng JIANG <jiang.cheng@vip.163.com>"]
edition = "2018"
license = "Apache-2.0"
Expand All @@ -9,12 +9,12 @@ homepage= "https://github.com/casbin-rs/diesel-adapter"
readme= "README.md"

[dependencies]
casbin = { version = "2.0.1", default-features = false }
casbin = { version = "2.0.2", default-features = false }
diesel = { version = "1.4.5", default-features = false, features = ["r2d2"] }
async-trait = "0.1.36"
async-trait = "0.1.40"
futures = "0.3.5"
tokio = { version = "0.2.21", default-features = false, optional = true }
async-std = { version = "1.6.2", default-features = false, optional = true }
tokio = { version = "0.2.22", default-features = false, optional = true }
async-std = { version = "1.6.4", default-features = false, optional = true }

[features]
default = ["postgres", "runtime-async-std"]
Expand All @@ -27,6 +27,6 @@ runtime-tokio = ["casbin/runtime-tokio", "tokio/blocking", "tokio/rt-core"]
runtime-async-std = ["casbin/runtime-async-std", "async-std/unstable"]

[dev-dependencies]
async-std = { version = "1.6.2", features = [ "attributes", "unstable"] }
tokio = { version = "0.2.21", features = [ "full" ] }
async-std = { version = "1.6.4", features = [ "attributes", "unstable"] }
tokio = { version = "0.2.22", features = [ "full" ] }

7 changes: 4 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ Based on [Diesel](https://github.com/diesel-rs/diesel), The current supported da
Add it to `Cargo.toml`

```
diesel-adapter = { version = "0.8.0", features = ["postgres"] }
async-std = "1.6.3"
diesel-adapter = { version = "0.8.1", features = ["postgres"] }
async-std = "1.6.4"
```

## Example
Expand All @@ -41,5 +41,6 @@ async fn main() -> Result<()> {

- `postgres`
- `mysql`
- `sqlite`

*Attention*: `postgres` and `mysql` are mutual exclusive which means that you can only activate one of them. Currently we don't have support for `sqlite`, it may be added in the near future.
*Attention*: `postgres`, `mysql`, `sqlite` are mutual exclusive which means that you can only activate one of them.

0 comments on commit 8fb219a

Please sign in to comment.