Skip to content

Commit

Permalink
Merge pull request #320 from plabayo/feat/305/align-tls-apis
Browse files Browse the repository at this point in the history
align boring/rustls apis
  • Loading branch information
GlenDC committed Sep 19, 2024
2 parents 5b9fd17 + 2414010 commit 5868d19
Show file tree
Hide file tree
Showing 61 changed files with 3,069 additions and 1,040 deletions.
24 changes: 24 additions & 0 deletions .github/workflows/Coverage.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
name: Coverage
on:
push:
branches:
- "main"
env:
RUST_BACKTRACE: 1
jobs:
coverage:
runs-on: ubuntu-latest
strategy:
matrix:
version:
- stable
target:
- x86_64-unknown-linux-gnu
fail-fast: false
steps:
- uses: actions/checkout@v4
- uses: dtolnay/rust-toolchain@stable
with:
toolchain: ${{ matrix.version }}
- name: coverage
run: cargo run --release -- tarpaulin --engine llvm --follow-exec --post-test-delay 10 --coveralls ${{ secrets.COVERALLS_TOKEN }}
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ just qa
Before you can do this you do require the following to be installed:

* `Rust`, version 1.80 or beyond: <https://www.rust-lang.org/tools/install>
* `just` (to run _just_ (config) files): <https://just.systems/man/en/chapter_4.html>
* `just` (to run _just_ (config) files): <https://just.systems/man/en/packages.html>
* `cargo hack`: <https://github.com/taiki-e/cargo-hack?tab=readme-ov-file#installation>

Once this is all done you should be able to run `just qa`.
Expand Down
77 changes: 41 additions & 36 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,7 @@ opentelemetry-otlp = { workspace = true }
opentelemetry_sdk = { workspace = true }
regex = { workspace = true }
serde = { workspace = true, features = ["derive"] }
serde_html_form = { workspace = true }
serde_json = { workspace = true }
tokio = { workspace = true, features = ["macros"] }
tracing = { workspace = true }
Expand Down Expand Up @@ -307,4 +308,4 @@ required-features = ["boring", "haproxy", "http-full"]

[[example]]
name = "tls_termination"
required-features = ["haproxy", "http-full", "rustls"]
required-features = ["rustls", "haproxy", "http-full"]
3 changes: 3 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
[![Apache 2.0 License][license-apache-badge]][license-apache-url]
[![rust version][rust-version-badge]][rust-version-url]
[![Build Status][actions-badge]][actions-url]
[![Coverage Status][coverage-badge]][coverage-url]
[![Lines of Code][loc-badge]][loc-url]

[crates-badge]: https://img.shields.io/crates/v/rama.svg
Expand All @@ -20,6 +21,8 @@
[rust-version-url]: https://www.rust-lang.org
[actions-badge]: https://github.com/plabayo/rama/workflows/CI/badge.svg
[actions-url]: https://github.com/plabayo/rama/actions
[coverage-badge]: https://coveralls.io/repos/github/plabayo/rama/badge.svg?branch=main
[coverage-url]: https://coveralls.io/github/plabayo/rama?branch=main
[loc-badge]: https://img.shields.io/endpoint?url=https://ghloc.vercel.app/api/plabayo/rama/badge?filter=.rs$&style=flat&logoColor=white&label=LoC
[loc-url]: https://github.com/plabayo/rama

Expand Down
Loading

0 comments on commit 5868d19

Please sign in to comment.