Skip to content

Commit 3fee8c5

Browse files
committed
limit s2n-tls CI to linux
1 parent 901d7b3 commit 3fee8c5

File tree

2 files changed

+37
-35
lines changed

2 files changed

+37
-35
lines changed

.github/workflows/linux.yml

Lines changed: 35 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -29,45 +29,45 @@ jobs:
2929
strategy:
3030
matrix:
3131
rust:
32-
- stable
33-
- beta
34-
- nightly
32+
- stable
33+
- beta
34+
- nightly
3535
steps:
36-
- name: Checkout sources
37-
uses: actions/checkout@v4
38-
with:
39-
submodules: true
40-
- name: Install ${{ matrix.rust }} toolchain
41-
uses: dtolnay/rust-toolchain@master
42-
with:
43-
toolchain: ${{ matrix.rust }}
44-
- name: Install dependencies
45-
run: |
46-
sudo apt-get update
47-
sudo apt-get install capnproto libc-ares-dev libssl-dev liblua5.4-dev
48-
- name: Cargo build
49-
run: cargo build
50-
- name: Cargo test
51-
run: cargo test --workspace --lib --examples
36+
- name: Checkout sources
37+
uses: actions/checkout@v4
38+
with:
39+
submodules: true
40+
- name: Install ${{ matrix.rust }} toolchain
41+
uses: dtolnay/rust-toolchain@master
42+
with:
43+
toolchain: ${{ matrix.rust }}
44+
- name: Install dependencies
45+
run: |
46+
sudo apt-get update
47+
sudo apt-get install capnproto libc-ares-dev libssl-dev liblua5.4-dev
48+
- name: Cargo build
49+
run: cargo build
50+
- name: Cargo test
51+
run: cargo test --workspace --lib --examples
5252

5353
clippy:
5454
name: Clippy
5555
runs-on: ubuntu-latest
5656
steps:
57-
- name: Checkout sources
58-
uses: actions/checkout@v4
59-
with:
60-
submodules: true
61-
- name: Install stable toolchain
62-
uses: dtolnay/rust-toolchain@stable
63-
with:
64-
components: clippy
65-
- name: Install dependencies
66-
run: |
67-
sudo apt-get update
68-
sudo apt-get install capnproto libc-ares-dev libssl-dev liblua5.4-dev
69-
- name: Cargo clippy
70-
run: cargo clippy --tests -- --deny warnings
57+
- name: Checkout sources
58+
uses: actions/checkout@v4
59+
with:
60+
submodules: true
61+
- name: Install stable toolchain
62+
uses: dtolnay/rust-toolchain@stable
63+
with:
64+
components: clippy
65+
- name: Install dependencies
66+
run: |
67+
sudo apt-get update
68+
sudo apt-get install capnproto libc-ares-dev libssl-dev liblua5.4-dev
69+
- name: Cargo clippy
70+
run: cargo clippy --tests -- --deny warnings
7171

7272
build-vendored:
7373
name: Build vendored
@@ -89,6 +89,8 @@ jobs:
8989
include:
9090
- feature: vendored-c-ares
9191
component: g3proxy
92+
- feature: s2n-tls
93+
component: g3tiles
9294
steps:
9395
- name: Checkout sources
9496
uses: actions/checkout@v4

g3tiles/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,10 @@ g3-build-env.workspace = true
6060
[features]
6161
default = ["quic"]
6262
quic = ["g3-daemon/quic", "g3-types/quinn", "dep:quinn"]
63-
s2n-tls = ["dep:s2n-tls", "dep:s2n-tls-tokio"]
63+
s2n-tls = ["dep:s2n-tls", "dep:s2n-tls-tokio", "vendored-aws-lc"]
6464
rustls-aws-lc = ["rustls/aws-lc-rs"]
6565
vendored-openssl = ["openssl/vendored", "openssl-probe"]
6666
vendored-tongsuo = ["openssl/tongsuo", "openssl-probe", "g3-yaml/tongsuo", "g3-types/tongsuo"]
67-
vendored-aws-lc = ["rustls-aws-lc", "s2n-tls", "openssl/aws-lc", "openssl-probe", "g3-types/aws-lc", "g3-openssl/aws-lc"]
67+
vendored-aws-lc = ["rustls-aws-lc", "openssl/aws-lc", "openssl-probe", "g3-types/aws-lc", "g3-openssl/aws-lc"]
6868
vendored-boringssl = ["openssl/boringssl", "openssl-probe", "g3-types/boringssl", "g3-openssl/boringssl"]
6969

0 commit comments

Comments
 (0)