Skip to content

Commit e584ed7

Browse files
committed
Remove providers from default features
This uncovers that ci was broken for ring-alone, as aws-lc-rs was still built for `rcgen`, but nothing was asking for prebuilt-nasm. Fix that by setting the environment variable.
1 parent 02c153c commit e584ed7

File tree

2 files changed

+22
-3
lines changed

2 files changed

+22
-3
lines changed

.github/workflows/ci.yml

Lines changed: 21 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,8 @@ jobs:
111111
- --features=alloc
112112
- --all-features
113113
- --no-default-features
114-
- --no-default-features --features alloc,std,aws-lc-rs
114+
- --no-default-features --features alloc,std,aws_lc_rs
115+
- --no-default-features --features alloc,std,ring
115116

116117
mode:
117118
- # debug
@@ -127,7 +128,8 @@ jobs:
127128
- features: --features=alloc
128129
- features: --no-default-features
129130
- features: --no-default-features --features alloc,std
130-
- features: --no-default-features --features alloc,std,aws-lc-rs
131+
- features: --no-default-features --features alloc,std,aws_lc_rs
132+
- features: --no-default-features --features alloc,std,ring
131133
- features: --all-features
132134
mode: --release
133135
- features: --all-features
@@ -204,6 +206,22 @@ jobs:
204206
rust_channel: stable
205207
host_os: ubuntu-latest
206208

209+
# check ring alone
210+
- features: --no-default-features --features alloc,std,ring
211+
mode: # debug
212+
rust_channel: stable
213+
host_os: macos-latest
214+
215+
- features: --no-default-features --features alloc,std,ring
216+
mode: # debug
217+
rust_channel: stable
218+
host_os: windows-latest
219+
220+
- features: --no-default-features --features alloc,std,ring
221+
mode: # debug
222+
rust_channel: stable
223+
host_os: ubuntu-latest
224+
207225
steps:
208226
- name: Checkout sources
209227
uses: actions/checkout@v4
@@ -223,6 +241,7 @@ jobs:
223241
run: cargo test --locked -vv ${{ matrix.features }} ${{ matrix.mode }} -- --ignored
224242
env:
225243
RUSTFLAGS: "-D warnings"
244+
AWS_LC_SYS_PREBUILT_NASM: "1" # for benefit of rcgen
226245

227246
msrv:
228247
name: MSRV

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ allowed_external_types = [
7373
name = "webpki"
7474

7575
[features]
76-
default = ["std", "ring"]
76+
default = ["std"]
7777
alloc = ["ring?/alloc", "pki-types/alloc"]
7878
aws-lc-rs = ["dep:aws-lc-rs", "aws-lc-rs/aws-lc-sys", "aws-lc-rs/prebuilt-nasm"]
7979
aws-lc-rs-fips = ["dep:aws-lc-rs", "aws-lc-rs/fips"]

0 commit comments

Comments
 (0)