Skip to content

Commit

Permalink
chore: fix aws_lc not in depend tree check in CI (#5121)
Browse files Browse the repository at this point in the history
* chore: fix aws_lc check in CI

* chore: update lock file
  • Loading branch information
discord9 authored Dec 11, 2024
1 parent 3d1b8c4 commit d915176
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 71 deletions.
1 change: 1 addition & 0 deletions .github/cargo-blacklist.txt
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
native-tls
openssl
aws-lc-sys
7 changes: 0 additions & 7 deletions .github/workflows/develop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -269,13 +269,6 @@ jobs:
- name: Install cargo-gc-bin
shell: bash
run: cargo install cargo-gc-bin
- name: Check aws-lc-sys will not build
shell: bash
run: |
if cargo tree -i aws-lc-sys -e features | grep -q aws-lc-sys; then
echo "Found aws-lc-sys, which has compilation problems on older gcc versions. Please replace it with ring until its building experience improves."
exit 1
fi
- name: Build greptime bianry
shell: bash
# `cargo gc` will invoke `cargo build` with specified args
Expand Down
61 changes: 2 additions & 59 deletions Cargo.lock

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

5 changes: 0 additions & 5 deletions src/servers/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -139,11 +139,6 @@ tokio-test = "0.4"
[target.'cfg(unix)'.dev-dependencies]
pprof = { version = "0.13", features = ["criterion", "flamegraph"] }

[target.'cfg(windows)'.dependencies]
aws-lc-sys = { version = "0.21.0", features = [
"prebuilt-nasm",
] } # use prebuilt nasm on windows per https://github.com/aws/aws-lc-rs/blob/main/aws-lc-sys/README.md#use-of-prebuilt-nasm-objects

[build-dependencies]
common-version.workspace = true

Expand Down

0 comments on commit d915176

Please sign in to comment.