diff --git a/.github/workflows/benchmark.yml b/.github/workflows/benchmark.yml index 891187bf..cdd5444b 100644 --- a/.github/workflows/benchmark.yml +++ b/.github/workflows/benchmark.yml @@ -1,3 +1,5 @@ +name: Benchmark + # Do not run this workflow on pull request since this workflow has permission to modify contents. on: push: @@ -32,9 +34,9 @@ jobs: # nightly can be very volatile--pin this to a version we know works well... toolchain: nightly-2022-08-11 override: true - # Run benchmark with `cargo +nightly -bench` and stores the output to a file + # Run benchmark with `cargo bench` and stores the output to a file - name: Run benchmark - run: cargo +nightly bench | tee output.txt + run: cargo bench -- --output-format bencher | tee output.txt # gh-pages branch is updated and pushed automatically with extracted benchmark data - name: Store benchmark result uses: benchmark-action/github-action-benchmark@v1 diff --git a/.github/workflows/ci_build_test.yml b/.github/workflows/ci_build_test.yml index d3c99fb3..1f4502ee 100644 --- a/.github/workflows/ci_build_test.yml +++ b/.github/workflows/ci_build_test.yml @@ -78,7 +78,6 @@ jobs: conformance-report: name: Create conformance report for `push` and `pull_request` events runs-on: ubuntu-20.04 - needs: [build] steps: # Pull down the cached `partiql-lang-rust` build from the `Build and Test` job. This allows us to reuse without # needing to rebuild. If pulling the build fails, the subsequent `cargo test` will rebuild. @@ -101,7 +100,7 @@ jobs: # to format and use the output. - name: Cargo Test of the conformance tests (can fail) and save to json file continue-on-error: true - run: cargo test --verbose --package partiql-conformance-tests --features "conformance_test" -- -Z unstable-options --ensure-time --format json > cargo_test_results.json + run: cargo test --verbose --package partiql-conformance-tests --features "conformance_test" --release -- -Z unstable-options --ensure-time --format json > cargo_test_results.json # Create a conformance report from the `cargo test` json file - run: cargo run --features report_tool --bin generate_cts_report cargo_test_results.json ${GITHUB_SHA} cts_report.json # Upload conformance report for comparison with future runs diff --git a/partiql-ast/Cargo.toml b/partiql-ast/Cargo.toml index 000aa4bc..418e7914 100644 --- a/partiql-ast/Cargo.toml +++ b/partiql-ast/Cargo.toml @@ -15,10 +15,9 @@ exclude = [ version.workspace = true edition.workspace = true -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - [lib] path = "src/lib.rs" +bench = false [dependencies] rust_decimal = { version = "1.25.0", default-features = false, features = ["std"] } diff --git a/partiql-ast/partiql-ast-macros/Cargo.toml b/partiql-ast/partiql-ast-macros/Cargo.toml index fb4d6174..a80a565a 100644 --- a/partiql-ast/partiql-ast-macros/Cargo.toml +++ b/partiql-ast/partiql-ast-macros/Cargo.toml @@ -19,6 +19,7 @@ edition.workspace = true [lib] proc-macro = true path = "src/lib.rs" +bench = false [dependencies] quote = "1.0.*" diff --git a/partiql-conformance-test-generator/Cargo.toml b/partiql-conformance-test-generator/Cargo.toml index c6acdbcb..b29a46b2 100644 --- a/partiql-conformance-test-generator/Cargo.toml +++ b/partiql-conformance-test-generator/Cargo.toml @@ -17,9 +17,8 @@ exclude = [ version.workspace = true edition.workspace = true -# TODO: fill in other details - -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html +[lib] +bench = false [dependencies] walkdir = "2.3" diff --git a/partiql-conformance-tests/Cargo.toml b/partiql-conformance-tests/Cargo.toml index 320fd493..b2b25d41 100644 --- a/partiql-conformance-tests/Cargo.toml +++ b/partiql-conformance-tests/Cargo.toml @@ -20,12 +20,12 @@ edition.workspace = true [[bin]] name = "generate_comparison_report" required-features = ["report_tool"] +bench = false [[bin]] name = "generate_cts_report" required-features = ["report_tool"] - -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html +bench = false [build-dependencies] miette = { version ="5.*", features = ["fancy"] } diff --git a/partiql-conformance-tests/src/main.rs b/partiql-conformance-tests/src/main.rs deleted file mode 100644 index f328e4d9..00000000 --- a/partiql-conformance-tests/src/main.rs +++ /dev/null @@ -1 +0,0 @@ -fn main() {} diff --git a/partiql-eval/Cargo.toml b/partiql-eval/Cargo.toml index 80751680..4d7c6c5e 100644 --- a/partiql-eval/Cargo.toml +++ b/partiql-eval/Cargo.toml @@ -17,7 +17,8 @@ exclude = [ version.workspace = true edition.workspace = true -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html +[lib] +bench = false [dependencies] partiql-logical = { path = "../partiql-logical", version = "0.2.*" } diff --git a/partiql-ir/Cargo.toml b/partiql-ir/Cargo.toml index 28123f0b..7cd520c8 100644 --- a/partiql-ir/Cargo.toml +++ b/partiql-ir/Cargo.toml @@ -17,6 +17,7 @@ exclude = [ version.workspace = true edition.workspace = true -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html +[lib] +bench = false [dependencies] diff --git a/partiql-irgen/Cargo.toml b/partiql-irgen/Cargo.toml index 0fd16725..90baccae 100644 --- a/partiql-irgen/Cargo.toml +++ b/partiql-irgen/Cargo.toml @@ -17,6 +17,7 @@ exclude = [ version.workspace = true edition.workspace = true -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html +[lib] +bench = false [dependencies] diff --git a/partiql-logical-planner/Cargo.toml b/partiql-logical-planner/Cargo.toml index 3b0190c4..41990991 100644 --- a/partiql-logical-planner/Cargo.toml +++ b/partiql-logical-planner/Cargo.toml @@ -17,6 +17,9 @@ exclude = [ version.workspace = true edition.workspace = true +[lib] +bench = false + [dependencies] partiql-value = { path = "../partiql-value", version = "0.2.*" } partiql-logical = { path = "../partiql-logical", version = "0.2.*" } diff --git a/partiql-logical/Cargo.toml b/partiql-logical/Cargo.toml index 408714cb..0c13cc98 100644 --- a/partiql-logical/Cargo.toml +++ b/partiql-logical/Cargo.toml @@ -17,7 +17,8 @@ exclude = [ version.workspace = true edition.workspace = true -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html +[lib] +bench = false [dependencies] partiql-value = { path = "../partiql-value", version = "0.2.*" } diff --git a/partiql-parser/Cargo.toml b/partiql-parser/Cargo.toml index c30ec1a8..41ccc91c 100644 --- a/partiql-parser/Cargo.toml +++ b/partiql-parser/Cargo.toml @@ -17,6 +17,8 @@ exclude = [ version.workspace = true edition.workspace = true +[lib] +bench = false # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [build-dependencies] diff --git a/partiql-rewriter/Cargo.toml b/partiql-rewriter/Cargo.toml index 534a7611..6bf079e3 100644 --- a/partiql-rewriter/Cargo.toml +++ b/partiql-rewriter/Cargo.toml @@ -17,6 +17,7 @@ exclude = [ version.workspace = true edition.workspace = true -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html +[lib] +bench = false [dependencies] diff --git a/partiql-source-map/Cargo.toml b/partiql-source-map/Cargo.toml index 3995b593..aea5fe14 100644 --- a/partiql-source-map/Cargo.toml +++ b/partiql-source-map/Cargo.toml @@ -15,7 +15,8 @@ exclude = [ version.workspace = true edition.workspace = true -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html +[lib] +bench = false [dependencies] smallvec = { version = "1.*" } diff --git a/partiql-types/Cargo.toml b/partiql-types/Cargo.toml index 71206c71..8454888a 100644 --- a/partiql-types/Cargo.toml +++ b/partiql-types/Cargo.toml @@ -17,7 +17,8 @@ exclude = [ version.workspace = true edition.workspace = true -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html +[lib] +bench = false [dependencies] ordered-float = "3.*" diff --git a/partiql-value/Cargo.toml b/partiql-value/Cargo.toml index ecc9625a..1925ed1a 100644 --- a/partiql-value/Cargo.toml +++ b/partiql-value/Cargo.toml @@ -17,7 +17,8 @@ exclude = [ version.workspace = true edition.workspace = true -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html +[lib] +bench = false [dependencies] ordered-float = "3.*" diff --git a/partiql/Cargo.toml b/partiql/Cargo.toml index 83736635..3d2affec 100644 --- a/partiql/Cargo.toml +++ b/partiql/Cargo.toml @@ -17,6 +17,9 @@ exclude = [ version.workspace = true edition.workspace = true +[lib] +bench = false + # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies]