Skip to content

Commit

Permalink
Fixing the build script as recommended
Browse files Browse the repository at this point in the history
  • Loading branch information
Razican committed Apr 21, 2022
1 parent 2e8fe7a commit e548324
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 11 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ jobs:
uses: actions-rs/cargo@v1
with:
command: test
args: --manifest-path diesel_dynamic_schema/Cargo.toml --no-default-features --features "${{ matrix.backend }}"
args: --manifest-path diesel_dynamic_schema/Cargo.toml --no-default-features --features "${{ matrix.backend }} diesel/${{ matrix.backend }}"

- name: Run diesel_benches
uses: actions-rs/cargo@v1
Expand Down Expand Up @@ -423,7 +423,6 @@ jobs:
ASAN_OPTIONS: detect_stack_use_after_return=1
run: cargo -Z build-std test --manifest-path diesel/Cargo.toml --no-default-features --features "sqlite extras libsqlite3-sys libsqlite3-sys/bundled libsqlite3-sys/with-asan" --target x86_64-unknown-linux-gnu


minimal_rust_version:
name: Check Minimal supported rust version (1.54.0)
runs-on: ubuntu-latest
Expand Down
6 changes: 3 additions & 3 deletions bin/test
Original file line number Diff line number Diff line change
Expand Up @@ -26,23 +26,23 @@ else
(cd diesel_migrations && cargo test --features "sqlite diesel/sqlite" $*)
(cd diesel_derives && cargo test --features "diesel/sqlite" $*)
(cd diesel_tests && cargo test --features "sqlite" --no-default-features $*)
(cd diesel_dynamic_schema && cargo test --features "sqlite" $*)
(cd diesel_dynamic_schema && cargo test --features "sqlite diesel/sqlite" $*)
(cd diesel_bench && cargo test --features "sqlite" --benches $*)

(cd diesel_migrations && cargo test --features "postgres diesel/postgres" $*)
(cd diesel_migrations/migrations_macros && cargo test --features "diesel/postgres postgres" $*)
(cd diesel_derives && cargo test --features "diesel/postgres" $*)
(cd diesel_cli && cargo test --features "postgres" --no-default-features $*)
(cd diesel_tests && cargo test --features "postgres" --no-default-features $*)
(cd diesel_dynamic_schema && cargo test --features "postgres" $*)
(cd diesel_dynamic_schema && cargo test --features "postgres diesel/postgres" $*)
(cd diesel_bench && cargo test --features "postgres" --benches $*)

(cd diesel_migrations && cargo test --features "mysql diesel/mysql" $* -- --test-threads 1)
(cd diesel_migrations/migrations_macros && cargo test --features "diesel/mysql mysql" $* -- --test-threads 1)
(cd diesel_derives && cargo test --features "diesel/mysql" $* -- --test-threads 1)
(cd diesel_cli && cargo test --features "mysql" --no-default-features $* -- --test-threads 1)
(cd diesel_tests && cargo test --features "mysql" --no-default-features $* -- --test-threads 1)
(cd diesel_dynamic_schema && cargo test --features "mysql" $* -- --test-threads 1)
(cd diesel_dynamic_schema && cargo test --features "mysql diesel/mysql" $* -- --test-threads 1)
(cd diesel_bench && cargo test --features "mysql" --benches $* -- --test-threads 1)

(cd diesel_compile_tests && cargo test $*)
Expand Down
6 changes: 0 additions & 6 deletions diesel_dynamic_schema/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,6 @@ version = "2.0.0"
path = "../diesel/"
default-features = false

[dev-dependencies.diesel]
version = "2.0.0"
path = "../diesel/"
default-features = false
features = ["postgres", "mysql"]

[dev-dependencies]
dotenvy = "0.15"

Expand Down

0 comments on commit e548324

Please sign in to comment.