Skip to content

Commit

Permalink
Adjustment project organization.
Browse files Browse the repository at this point in the history
  • Loading branch information
gudaoxuri committed Jul 29, 2022
1 parent 7fd82fd commit 1c4ea1f
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 27 deletions.
29 changes: 3 additions & 26 deletions .github/workflows/cicd.yml
Expand Up @@ -6,7 +6,7 @@ env:
TARDIS_TEST_DISABLED_DOCKER: true

jobs:
check-tardis:
check:
runs-on: ubuntu-latest
services:
mysql:
Expand Down Expand Up @@ -50,13 +50,13 @@ jobs:
run: cargo fmt --all -- --check

- name: Check clippy
run: cargo clippy --all-features
run: cargo clippy --all --all-features

- name: Run cargo-tarpaulin
uses: actions-rs/tarpaulin@v0.1
with:
version: '0.20.1'
args: '--all-features'
args: '--all --all-features'

- name: Upload to codecov.io
uses: codecov/codecov-action@v2
Expand All @@ -69,29 +69,6 @@ jobs:
name: code-coverage-report
path: cobertura.xml

check-examples:
runs-on: ubuntu-latest
steps:
- name: Check out the repo
uses: actions/checkout@v3

- name: Init rust envrionment
uses: actions-rs/toolchain@v1
with:
toolchain: stable
components: rustfmt, clippy

- name: Cache rust
uses: Swatinem/rust-cache@v1

- name: Check format
run: cargo fmt --all -- --check
working-directory: examples

- name: Check clippy
run: cargo clippy
working-directory: examples

publish:
if: startsWith(github.ref, 'refs/tags/')
needs: [check-tardis, check-examples]
Expand Down
10 changes: 9 additions & 1 deletion Cargo.toml
@@ -1,3 +1,7 @@
[workspace]
# members = [".", "tardis-macros", "examples/*"]
members = [".", "examples/*"]

[package]
name = "tardis"
version = "0.1.0-alpha18"
Expand Down Expand Up @@ -26,6 +30,7 @@ name = "tardis"
path = "src/lib.rs"

[features]
#default = ["trace", "rt_tokio", "tardis-macros"]
default = ["trace", "rt_tokio"]
trace = ["tracing", "tracing-subscriber"]
crypto = ["rust-crypto", "rsa"]
Expand Down Expand Up @@ -60,6 +65,9 @@ regex = { version = "1.5" }
url = { version = "2.2" }
openssl = { version = "0.10", features = ["vendored"] }

# macros
# tardis-macros = { path = "tardis-macros", optional = true }

# Tokio
tokio = { version = "1.18", features = ["macros", "rt-multi-thread", "signal", "time"], optional = true }

Expand All @@ -81,7 +89,7 @@ tracing-subscriber = { version = "0.3", features = ["env-filter"], optional = tr

# RelDB
sea-orm = { version = "0.9", features = ["sqlx-all", "macros", "runtime-tokio-native-tls", "debug-print"], optional = true }
sqlparser = { version = "0.17", optional = true }
sqlparser = { version = "0.18", optional = true }

# Web Server
poem-openapi = { version = "2", features = ["rapidoc", "chrono"], optional = true }
Expand Down

0 comments on commit 1c4ea1f

Please sign in to comment.