Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: change default tls features to rustls #3759

Closed
wants to merge 5 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 30 additions & 28 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,10 @@ jobs:
TEST_RUNS: "[r1]" # default runs
outputs:
check: ${{ steps.check.outputs.check }}
runs: ${{ steps.runs.outputs.runs }}
# runs: ${{ steps.runs.outputs.runs }}
steps:
- id: check
run: echo "::set-output name=check::${{ env.ENABLE_CHECK }}"
run: echo "check=${{ env.ENABLE_CHECK }} >> $GITHUB_OUTPUT"
#- name: Set Staging runs
## if: github.event_name == 'merge_group'
# run: echo "TEST_RUNS='[r1,r2,r3,r4,r5]'" | tee -a $GITHUB_ENV
Expand All @@ -64,7 +64,7 @@ jobs:
rust-target:
- x86_64-unknown-linux-musl
- aarch64-unknown-linux-musl
binary: [fluvio, fluvio-run, fluvio-test, fluvio-channel, smdk, fbm, cdk, fvm]
binary: [fluvio, fluvio-run, fluvio-test, smdk, fbm, cdk, fvm]
os: [ubuntu-latest]
env:
RUST_BACKTRACE: full
Expand Down Expand Up @@ -120,7 +120,9 @@ jobs:

- name: Build fbm
if: matrix.binary == 'fbm'
run: make build-fbm
run: |
cargo tree -p fluvio-benchmark
make build-fbm

- name: Build fvm
if: matrix.binary == 'fvm'
Expand Down Expand Up @@ -171,23 +173,23 @@ jobs:
rust-target: aarch64-apple-darwin
binary: fluvio-run

# fluvio-channel
- os: ubuntu-latest
rust-target: arm-unknown-linux-gnueabihf
binary: fluvio-channel
- os: ubuntu-latest
rust-target: armv7-unknown-linux-gnueabihf
binary: fluvio-channel
- os: ubuntu-latest
rust: stable
rust-target: x86_64-pc-windows-gnu
binary: fluvio-channel.exe
- os: macos-12
rust-target: x86_64-apple-darwin
binary: fluvio-channel
- os: macos-12
rust-target: aarch64-apple-darwin
binary: fluvio-channel
# # fluvio-channel
# - os: ubuntu-latest
# rust-target: arm-unknown-linux-gnueabihf
# binary: fluvio-channel
# - os: ubuntu-latest
# rust-target: armv7-unknown-linux-gnueabihf
# binary: fluvio-channel
# - os: ubuntu-latest
# rust: stable
# rust-target: x86_64-pc-windows-gnu
# binary: fluvio-channel.exe
# - os: macos-12
# rust-target: x86_64-apple-darwin
# binary: fluvio-channel
# - os: macos-12
# rust-target: aarch64-apple-darwin
# binary: fluvio-channel

# smdk
- os: macos-12
Expand Down Expand Up @@ -521,7 +523,7 @@ jobs:
crate:
- fluvio
- fluvio-cli
- fluvio-channel
# - fluvio-channel
#- smartmodule-development-kit
env:
RUST_BACKTRACE: full
Expand Down Expand Up @@ -922,7 +924,7 @@ jobs:
runs-on: ${{ matrix.os }}
env:
SPU: 2
CLI_TEST_RETRIES: 3
CLI_TEST_RETRIES: 3
strategy:
# fail-fast: false
matrix:
Expand Down Expand Up @@ -1067,7 +1069,7 @@ jobs:
needs: build_primary_binaries
runs-on: ${{ matrix.os }}
env:
CLI_TEST_RETRIES: 3
CLI_TEST_RETRIES: 3
strategy:
matrix:
os: [ubuntu-latest]
Expand Down Expand Up @@ -1139,7 +1141,7 @@ jobs:

# Runs tests on `tests/cli/partition_test`
partition_test:
name: Partitions Test (${{ matrix.test }} with ${{ matrix.spu }} SPUs, ${{ matrix.partitions }} Partitions and ${{ matrix.replication }} Replicas), Run Mode ${{ matrix.run-mode }}
name: Partitions Test (${{ matrix.test }} with ${{ matrix.spu }} SPUs, ${{ matrix.partitions }} Partitions and ${{ matrix.replication }} Replicas), Run Mode ${{ matrix.run-mode }}
runs-on: ${{ matrix.os }}
env:
FLUVIO_BIN: "~/bin/fluvio"
Expand Down Expand Up @@ -1346,7 +1348,7 @@ jobs:
- arm-unknown-linux-gnueabihf
- x86_64-apple-darwin
- x86_64-unknown-linux-musl
artifact: [fluvio, fluvio-channel, smdk, fbm, cdk, fvm]
artifact: [fluvio, smdk, fbm, cdk, fvm]
exclude:
- rust-target: armv7-unknown-linux-gnueabihf
artifact: smdk
Expand All @@ -1373,8 +1375,8 @@ jobs:
artifact: fluvio-run
- rust-target: x86_64-pc-windows-gnu
artifact: fluvio.exe
- rust-target: x86_64-pc-windows-gnu
artifact: fluvio-channel.exe
# - rust-target: x86_64-pc-windows-gnu
# artifact: fluvio-channel.exe
- rust-target: x86_64-unknown-linux-musl
artifact: fluvio-test
- rust-target: x86_64-pc-windows-gnu
Expand Down
123 changes: 6 additions & 117 deletions Cargo.lock

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

2 changes: 0 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ members = [
"crates/fluvio",
"crates/fluvio-auth",
"crates/fluvio-benchmark",
"crates/fluvio-channel",
"crates/fluvio-channel-cli",
"crates/fluvio-cli",
"crates/fluvio-cli-common",
"crates/fluvio-cluster",
Expand Down
2 changes: 1 addition & 1 deletion crates/cdk/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ serde = { workspace = true, features = ["derive"] }
toml = { workspace = true, features = ["parse", "display", "preserve_order"] }
comfy-table = { workspace = true }
sysinfo = { workspace = true, default-features = false }
cargo-generate = { workspace = true }
cargo-generate = { workspace = true, features = ["vendored-openssl"] }
include_dir = { workspace = true }
tempfile = { workspace = true }
current_platform = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion crates/fluvio-auth/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ tracing = { workspace = true }
x509-parser = { workspace = true }

fluvio-controlplane-metadata = { workspace = true }
fluvio-future = { workspace = true, features = ["net", "openssl_tls"] }
fluvio-future = { workspace = true, features = ["net", "tls"] }
fluvio-protocol = { workspace = true }
fluvio-socket = { workspace = true }
fluvio-types = { workspace = true }
Expand Down
Loading
Loading