Skip to content

Commit dcb412c

Browse files
authored
feat: fix issues in CI (#103)
* feat: fix cargo-tarpaulin run failed issue in CI * feat: resolve permission issue with public schema in PostgreSQL 15+ * feat: Fix clippy::extra_unused_lifetimes warning in src/action.rs
1 parent 9707f2b commit dcb412c

File tree

3 files changed

+17
-7
lines changed

3 files changed

+17
-7
lines changed

.github/workflows/ci.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,9 @@ jobs:
3838
sudo -u postgres createuser casbin_rs
3939
sudo -u postgres createdb casbin
4040
sudo -u postgres psql -c "alter user casbin_rs with encrypted password 'casbin_rs'; grant all privileges on database casbin to casbin_rs;"
41+
sudo -u postgres psql -c "GRANT USAGE, CREATE ON SCHEMA public TO casbin_rs;"
42+
sudo -u postgres psql -c "GRANT ALL ON DATABASE casbin TO casbin_rs;"
43+
sudo -u postgres psql -c "ALTER DATABASE casbin OWNER TO casbin_rs;"
4144
sudo service postgresql restart && sleep 3
4245
sudo systemctl start mysql.service
4346
mysql -e "create user 'casbin_rs'@'localhost' identified by 'casbin_rs'; create database casbin; grant all on \`casbin\`.* to 'casbin_rs'@'localhost';" -uroot -proot
@@ -57,6 +60,9 @@ jobs:
5760
createuser casbin_rs
5861
createdb casbin
5962
psql postgres -c "alter user casbin_rs with encrypted password 'casbin_rs'; grant all privileges on database casbin to casbin_rs;"
63+
psql postgres -c "GRANT USAGE, CREATE ON SCHEMA public TO casbin_rs;"
64+
psql postgres -c "GRANT ALL ON DATABASE casbin TO casbin_rs;"
65+
psql postgres -c "ALTER DATABASE casbin OWNER TO casbin_rs;"
6066
#echo "/usr/local/opt/[email protected]/bin" >> $GITHUB_PATH
6167
#/usr/local/opt/[email protected]/bin/mysql_install_db
6268
#/usr/local/opt/[email protected]/bin/mysql.server start

.github/workflows/coverage.yml

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -51,13 +51,17 @@ jobs:
5151
CONSTRAINT unique_key_sqlx_adapter UNIQUE(ptype, v0, v1, v2, v3, v4, v5)
5252
);"
5353

54+
- name: Install cargo-tarpaulin
55+
uses: baptiste0928/cargo-install@v3
56+
with:
57+
crate: cargo-tarpaulin
58+
5459
- name: Run cargo-tarpaulin
55-
uses: actions-rs/[email protected]
5660
env:
5761
DATABASE_URL: postgres://casbin_rs:casbin_rs@localhost:5432/casbin
58-
with:
59-
version: '0.22.0'
60-
args: --avoid-cfg-tarpaulin --out Xml
62+
run: |
63+
cargo tarpaulin --avoid-cfg-tarpaulin --out Xml
64+
6165
6266
- name: Upload to codecov.io
6367
uses: codecov/codecov-action@v1

src/actions.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -631,7 +631,7 @@ pub(crate) async fn load_policy(conn: &ConnectionPool) -> Result<Vec<CasbinRule>
631631
}
632632

633633
#[cfg(feature = "postgres")]
634-
pub(crate) async fn load_filtered_policy<'a>(
634+
pub(crate) async fn load_filtered_policy(
635635
conn: &ConnectionPool,
636636
filter: &Filter<'_>,
637637
) -> Result<Vec<CasbinRule>> {
@@ -654,7 +654,7 @@ pub(crate) async fn load_filtered_policy<'a>(
654654
}
655655

656656
#[cfg(feature = "sqlite")]
657-
pub(crate) async fn load_filtered_policy<'a>(
657+
pub(crate) async fn load_filtered_policy(
658658
conn: &ConnectionPool,
659659
filter: &Filter<'_>,
660660
) -> Result<Vec<CasbinRule>> {
@@ -677,7 +677,7 @@ pub(crate) async fn load_filtered_policy<'a>(
677677
}
678678

679679
#[cfg(feature = "mysql")]
680-
pub(crate) async fn load_filtered_policy<'a>(
680+
pub(crate) async fn load_filtered_policy(
681681
conn: &ConnectionPool,
682682
filter: &Filter<'_>,
683683
) -> Result<Vec<CasbinRule>> {

0 commit comments

Comments
 (0)