Skip to content

Commit

Permalink
feat: upgrade dependencies to support casbin 2.1.0 and sqlx 0.7 (#87)
Browse files Browse the repository at this point in the history
* fix: upgrade casbin to v2.1.0

* feat: update sqlx version to 0.7

Signed-off-by: Igor Pashev <pashev.igor@gmail.com>

(cherry picked from commit 7bf0de0)

* fix: remove ci steps about actix

* fix: brew upgrade issue

* fix: brew upgrade issue

---------

Co-authored-by: Igor Pashev <pashev.igor@gmail.com>
  • Loading branch information
MuZhou233 and ip1981 authored Feb 8, 2024
1 parent c1e50ca commit ecdbbd7
Show file tree
Hide file tree
Showing 17 changed files with 329 additions and 375 deletions.
55 changes: 4 additions & 51 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,10 @@ jobs:
- name: Setup PostgreSQL & MySQL & SQLite (for macOS)
if: matrix.os == 'macOS-latest'
run: |
# Unlink and re-link to prevent errors when github mac runner images
# https://github.com/actions/setup-python/issues/577
brew list -1 | grep python | while read formula; do brew unlink $formula; brew link --overwrite $formula; done
brew update
brew uninstall --ignore-dependencies node
brew install node@18
Expand Down Expand Up @@ -173,23 +177,6 @@ jobs:
command: test
args: --no-default-features --features postgres,runtime-tokio-rustls

# actix
- name: Cargo Test For PostgreSQL,runtime-actix-native-tls
uses: actions-rs/cargo@v1
env:
DATABASE_URL: postgres://casbin_rs:casbin_rs@localhost:5432/casbin
with:
command: test
args: --no-default-features --features postgres,runtime-actix-native-tls

- name: Cargo Test For PostgreSQL,runtime-actix-rustls
uses: actions-rs/cargo@v1
env:
DATABASE_URL: postgres://casbin_rs:casbin_rs@localhost:5432/casbin
with:
command: test
args: --no-default-features --features postgres,runtime-actix-rustls

# MySQL
# async-std
- name: Cargo Test For MySQL,runtime-async-std-native-tls
Expand Down Expand Up @@ -225,23 +212,6 @@ jobs:
command: test
args: --no-default-features --features mysql,runtime-tokio-rustls

# actix
- name: Cargo Test For MySQL,runtime-actix-native-tls
uses: actions-rs/cargo@v1
env:
DATABASE_URL: mysql://casbin_rs:casbin_rs@localhost:3306/casbin
with:
command: test
args: --no-default-features --features mysql,runtime-actix-native-tls

- name: Cargo Test For MySQL,runtime-actix-rustls
uses: actions-rs/cargo@v1
env:
DATABASE_URL: mysql://casbin_rs:casbin_rs@localhost:3306/casbin
with:
command: test
args: --no-default-features --features mysql,runtime-actix-rustls

#SQLite
#async-std
- name: Cargo Test For SQLite,runtime-async-std-native-tls
Expand Down Expand Up @@ -277,23 +247,6 @@ jobs:
command: test
args: --no-default-features --features sqlite,runtime-tokio-rustls

# actix
- name: Cargo Test For SQLite,runtime-actix-native-tls
uses: actions-rs/cargo@v1
env:
DATABASE_URL: sqlite:casbin.db
with:
command: test
args: --no-default-features --features sqlite,runtime-actix-native-tls

- name: Cargo Test For SQLite,runtime-actix-rustls
uses: actions-rs/cargo@v1
env:
DATABASE_URL: sqlite:casbin.db
with:
command: test
args: --no-default-features --features sqlite,runtime-actix-rustls

- name: Cargo Clippy
uses: actions-rs/cargo@v1
with:
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit ecdbbd7

Please sign in to comment.