diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index f6a9d6daa..00c7bfb47 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -29,45 +29,45 @@ jobs: strategy: matrix: rust: - - stable - - beta - - nightly + - stable + - beta + - nightly steps: - - name: Checkout sources - uses: actions/checkout@v4 - with: - submodules: true - - name: Install ${{ matrix.rust }} toolchain - uses: dtolnay/rust-toolchain@master - with: - toolchain: ${{ matrix.rust }} - - name: Install dependencies - run: | - sudo apt-get update - sudo apt-get install capnproto libc-ares-dev libssl-dev liblua5.4-dev - - name: Cargo build - run: cargo build - - name: Cargo test - run: cargo test --workspace --lib --examples + - name: Checkout sources + uses: actions/checkout@v4 + with: + submodules: true + - name: Install ${{ matrix.rust }} toolchain + uses: dtolnay/rust-toolchain@master + with: + toolchain: ${{ matrix.rust }} + - name: Install dependencies + run: | + sudo apt-get update + sudo apt-get install capnproto libc-ares-dev libssl-dev liblua5.4-dev + - name: Cargo build + run: cargo build + - name: Cargo test + run: cargo test --workspace --lib --examples clippy: name: Clippy runs-on: ubuntu-latest steps: - - name: Checkout sources - uses: actions/checkout@v4 - with: - submodules: true - - name: Install stable toolchain - uses: dtolnay/rust-toolchain@stable - with: - components: clippy - - name: Install dependencies - run: | - sudo apt-get update - sudo apt-get install capnproto libc-ares-dev libssl-dev liblua5.4-dev - - name: Cargo clippy - run: cargo clippy --tests -- --deny warnings + - name: Checkout sources + uses: actions/checkout@v4 + with: + submodules: true + - name: Install stable toolchain + uses: dtolnay/rust-toolchain@stable + with: + components: clippy + - name: Install dependencies + run: | + sudo apt-get update + sudo apt-get install capnproto libc-ares-dev libssl-dev liblua5.4-dev + - name: Cargo clippy + run: cargo clippy --tests -- --deny warnings build-vendored: name: Build vendored @@ -89,6 +89,8 @@ jobs: include: - feature: vendored-c-ares component: g3proxy + - feature: s2n-tls + component: g3tiles steps: - name: Checkout sources uses: actions/checkout@v4 diff --git a/g3tiles/Cargo.toml b/g3tiles/Cargo.toml index b7a55c084..c36236dc2 100644 --- a/g3tiles/Cargo.toml +++ b/g3tiles/Cargo.toml @@ -60,10 +60,10 @@ g3-build-env.workspace = true [features] default = ["quic"] quic = ["g3-daemon/quic", "g3-types/quinn", "dep:quinn"] -s2n-tls = ["dep:s2n-tls", "dep:s2n-tls-tokio"] +s2n-tls = ["dep:s2n-tls", "dep:s2n-tls-tokio", "vendored-aws-lc"] rustls-aws-lc = ["rustls/aws-lc-rs"] vendored-openssl = ["openssl/vendored", "openssl-probe"] vendored-tongsuo = ["openssl/tongsuo", "openssl-probe", "g3-yaml/tongsuo", "g3-types/tongsuo"] -vendored-aws-lc = ["rustls-aws-lc", "s2n-tls", "openssl/aws-lc", "openssl-probe", "g3-types/aws-lc", "g3-openssl/aws-lc"] +vendored-aws-lc = ["rustls-aws-lc", "openssl/aws-lc", "openssl-probe", "g3-types/aws-lc", "g3-openssl/aws-lc"] vendored-boringssl = ["openssl/boringssl", "openssl-probe", "g3-types/boringssl", "g3-openssl/boringssl"]