Skip to content

Commit fa3c68a

Browse files
committed
fix ci for aws-lc-rs features
1 parent 1a08e8d commit fa3c68a

File tree

8 files changed

+48
-4097
lines changed

8 files changed

+48
-4097
lines changed

.github/workflows/release.yaml

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ jobs:
1616
# By default, runs on Ubuntu, otherwise, override with the desired os
1717
runs-on: ${{ matrix.platform.os || 'ubuntu-22.04' }}
1818
strategy:
19+
fail-fast: false
1920
matrix:
2021
# Set platforms you want to build your binaries on
2122
platform:
@@ -26,31 +27,31 @@ jobs:
2627

2728
- name: Linux x86
2829
target: i686-unknown-linux-musl
29-
build-args: "--release"
30+
build-args: "--release --features aws-lc-rs-bindgen"
3031

3132
- name: Linux aarch64
3233
target: aarch64-unknown-linux-musl
3334
build-args: "--release --features=jemalloc"
3435

3536
- name: Linux armv7hf
3637
target: armv7-unknown-linux-musleabihf
37-
build-args: "--release"
38+
build-args: "--release --no-default-features --features ring"
3839

3940
- name: Freebsd x86_64
4041
target: x86_64-unknown-freebsd
41-
build-args: "--release --features=jemalloc"
42+
build-args: "--release --features aws-lc-rs-bindgen --features=jemalloc"
4243

4344
- name: Freebsd x86
4445
target: i686-unknown-freebsd
45-
build-args: "--release"
46+
build-args: "--release --no-default-features --features ring"
4647

4748
- name: Android aarch64
4849
target: aarch64-linux-android
4950
build-args: "--release --features=jemalloc"
5051

5152
- name: Android armv7
5253
target: armv7-linux-androideabi
53-
build-args: "--release"
54+
build-args: "--release --no-default-features --features ring"
5455

5556
#- name: Linux mips
5657
# target: mips-unknown-linux-musl
@@ -86,16 +87,16 @@ jobs:
8687
- name: Windows x86
8788
os: windows-latest
8889
target: i686-pc-windows-msvc
89-
build-args: "--profile release-with-symbols"
90+
build-args: "--profile release-with-symbols --no-default-features --features ring"
9091

9192
steps:
9293
- name: Install package for linux
9394
if: contains(matrix.platform.target, 'linux')
94-
run: sudo apt install musl-tools
95+
run: sudo apt install musl-tools libclang-dev
9596

9697
- name: Install package for Android
9798
if: contains(matrix.platform.target, 'android')
98-
run: sudo apt install android-libunwind android-libunwind-dev libunwind-dev
99+
run: sudo apt install android-libunwind android-libunwind-dev libunwind-dev
99100

100101
- name: Set up JDK 17
101102
if: contains(matrix.platform.target, 'android')
@@ -126,6 +127,9 @@ jobs:
126127
if: contains(matrix.platform.target, 'android')
127128
run: cargo install cross --git https://github.com/cross-rs/cross
128129

130+
- name: Install bindgen-cli
131+
run: cargo install bindgen-cli
132+
129133
- name: Show command used for Cargo
130134
run: |
131135
echo "cargo command is: ${{ env.CARGO }}"

Cargo.lock

Lines changed: 25 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[workspace]
2-
resolver = "2"
2+
resolver = "3"
33

44
members = [
55
"wstunnel",

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ ARG BIN_TARGET=--bins
3232
ARG PROFILE=release
3333

3434
#ENV RUSTFLAGS="-C link-arg=-Wl,--compress-debug-sections=zlib -C force-frame-pointers=yes"
35-
RUN cargo build --package=wstunnel-cli --features=jemalloc --profile=${PROFILE} ${BIN_TARGET}
35+
RUN cargo build --features=jemalloc --profile=${PROFILE} ${BIN_TARGET}
3636

3737

3838
############################################################

justfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@ _default:
44
@just --list
55

66
make_release $VERSION $FORCE="":
7-
sed -i 's/^version = .*/version = "'$VERSION'"/g' wstunnel-cli/Cargo.toml Cargo.toml
7+
sed -i 's/^version = .*/version = "'$VERSION'"/g' wstunnel-cli/Cargo.toml wstunnel/Cargo.toml
88
cargo fmt --all -- --check --color=always || (echo "Use cargo fmt to format your code"; exit 1)
99
cargo clippy --all --all-features -- -D warnings || (echo "Solve your clippy warnings to succeed"; exit 1)
10-
git add Cargo.* wstunnel-cli/Cargo.toml
10+
git add wstunnel/Cargo.* wstunnel-cli/Cargo.* Cargo.*
1111
git commit -m 'Bump version v'$VERSION
1212
git tag $FORCE v$VERSION -m 'version v'$VERSION
1313
git push $FORCE

wstunnel-cli/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ default = ["aws-lc-rs"]
1919
jemalloc = ["dep:tikv-jemallocator"]
2020
aws-lc-rs = ["wstunnel/aws-lc-rs"]
2121
ring = ["wstunnel/ring"]
22+
aws-lc-rs-bindgen = ["wstunnel/aws-lc-rs-bindgen"]
2223

2324
[[bin]]
2425
name = "wstunnel"

0 commit comments

Comments
 (0)