diff --git a/.github/workflows/cicd.yml b/.github/workflows/cicd.yml index 3cc77128..4e00d594 100644 --- a/.github/workflows/cicd.yml +++ b/.github/workflows/cicd.yml @@ -6,7 +6,7 @@ env: TARDIS_TEST_DISABLED_DOCKER: true jobs: - check-tardis: + check: runs-on: ubuntu-latest services: mysql: @@ -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 @@ -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] diff --git a/Cargo.toml b/Cargo.toml index fb5a83f7..843464a8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,3 +1,7 @@ +[workspace] +# members = [".", "tardis-macros", "examples/*"] +members = [".", "examples/*"] + [package] name = "tardis" version = "0.1.0-alpha18" @@ -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"] @@ -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 } @@ -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 }