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

Testing GNU failures #927

Closed
wants to merge 29 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
b700163
set one version back
Thomas-Avery Jul 26, 2024
5300223
Merge branch 'main' into test-gnu
Thomas-Avery Jul 30, 2024
1399732
try 1.79 on windows
Thomas-Avery Aug 6, 2024
7580f32
Merge branch 'main' into test-gnu
Thomas-Avery Aug 6, 2024
6c536f8
test platform verifier bump
Thomas-Avery Aug 6, 2024
1cb6771
revert back to stable
Thomas-Avery Aug 6, 2024
5e8f558
windows troubleshooting
Thomas-Avery Aug 6, 2024
2f41b0b
More windows testing
Thomas-Avery Aug 8, 2024
3ec0ba7
Merge branch 'main' into test-gnu
Thomas-Avery Aug 8, 2024
4a6ff31
try zig build
Thomas-Avery Aug 8, 2024
63c0d59
try using windows 2019
Thomas-Avery Aug 8, 2024
94bedaf
try removing choco llvm
Thomas-Avery Aug 8, 2024
02c1b8c
add vs clang to path
Thomas-Avery Aug 8, 2024
d3e883e
fix path add
Thomas-Avery Aug 8, 2024
24d2866
test remove
Thomas-Avery Aug 9, 2024
591aaee
test rustls-tls-native-roots
Thomas-Avery Aug 13, 2024
8569160
cargo fmt
Thomas-Avery Aug 13, 2024
02929a6
remove uninstall llvm
Thomas-Avery Aug 13, 2024
3a23093
reset to main
Thomas-Avery Aug 13, 2024
c85aa09
test min reproduce
Thomas-Avery Aug 13, 2024
d080fd8
fix workflow
Thomas-Avery Aug 13, 2024
22c341e
edit test
Thomas-Avery Aug 13, 2024
5020359
use exact tokio version
Thomas-Avery Aug 13, 2024
d5462df
Add logger
Thomas-Avery Aug 13, 2024
6a7e7ca
Test fix
Thomas-Avery Aug 13, 2024
b6c2b41
Merge branch 'main' into test-gnu
Thomas-Avery Aug 13, 2024
5f89420
match workflow test
Thomas-Avery Aug 13, 2024
c2ebf16
bump env logger
Thomas-Avery Aug 13, 2024
d92ffad
add test crate
Thomas-Avery Aug 13, 2024
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
14 changes: 3 additions & 11 deletions .github/workflows/build-cli.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,21 +60,13 @@ jobs:
- name: Checkout repo
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7

- name: Install rust
uses: dtolnay/rust-toolchain@7b1c307e0dcbda6122208f10795a713336a9b35a # stable
with:
toolchain: stable
targets: ${{ matrix.settings.target }}

- name: Cache cargo registry
uses: Swatinem/rust-cache@23bce251a8cd2ffc3c1075eaa2367cf899916d84 # v2.7.3
with:
key: ${{ matrix.settings.target }}-cargo-${{ matrix.settings.os }}
- name: Add Rust target
run: rustup target add ${{ matrix.settings.target }}

- name: Build
env:
TARGET: ${{ matrix.settings.target }}
run: cargo build ${{ matrix.features }} -p bws --release --target=${{ matrix.settings.target }}
run: cargo build -p bws --release --target=${{ matrix.settings.target }}

- name: Login to Azure
if: ${{ needs.setup.outputs.sign == 'true' }}
Expand Down
34 changes: 34 additions & 0 deletions .github/workflows/build-test-rustls-platform-verifier.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
---
name: Build test rustls platform verifier

on:
push:
branches:
- main
- rc
- hotfix-rc
pull_request:
workflow_dispatch:

defaults:
run:
shell: bash



jobs:
build-windows:
name: Build Windows
runs-on: windows-2022
steps:
- name: Checkout repo
uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7

- name: Build
run: cargo build -p test-rustls-platform-verifier --release --target=x86_64-pc-windows-msvc

- name: Upload artifact
uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4.3.6
with:
name: test-rustls-platform-verifier
path: ./target/x86_64-pc-windows-msvc/release/test-rustls-platform-verifier.exe
10 changes: 10 additions & 0 deletions Cargo.lock

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

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[workspace]
resolver = "2"
members = ["crates/*"]
members = ["crates/*", "test-rustls-platform-verifier"]

# Global settings for all crates should be defined here
[workspace.package]
Expand Down
2 changes: 1 addition & 1 deletion crates/bitwarden-core/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ zxcvbn = ">=3.0.1, <4.0"
reqwest = { version = ">=0.12.5, <0.13", features = [
"rustls-tls-manual-roots",
], default-features = false }
rustls-platform-verifier = "0.3.1"
rustls-platform-verifier = "0.3.3"

[target.'cfg(target_os = "android")'.dependencies]
# On android, the use of rustls-platform-verifier is more complicated and going through some changes at the moment, so we fall back to using webpki-roots
Expand Down
4 changes: 2 additions & 2 deletions crates/bws/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ clap_complete = "4.5.2"
color-eyre = "0.6.3"
comfy-table = "7.1.1"
directories = "5.0.1"
env_logger = "0.11.1"
env_logger = "0.11.5"
log = "0.4.20"
regex = { version = "1.10.3", features = [
"std",
Expand All @@ -40,7 +40,7 @@ serde_json = "1.0.113"
serde_yaml = "0.9"
supports-color = "3.0.0"
thiserror = "1.0.57"
tokio = { version = "1.36.0", features = ["rt-multi-thread", "macros"] }
tokio = { version = "1.39.2", features = ["rt-multi-thread", "macros"] }
toml = "0.8.10"
uuid = { version = "1.7.0", features = ["serde"] }

Expand Down
22 changes: 22 additions & 0 deletions test-rustls-platform-verifier/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
[package]
name = "test-rustls-platform-verifier"
version.workspace = true
authors.workspace = true
edition.workspace = true
rust-version.workspace = true
homepage.workspace = true
repository.workspace = true
license-file.workspace = true
keywords.workspace = true


[lints]
workspace = true

[dependencies]
reqwest = { version = "0.12.5", features = [
"rustls-tls-manual-roots",
], default-features = false }
rustls-platform-verifier = "0.3.3"
tokio = { version = "1.39.2", features = ["rt-multi-thread", "macros"] }
env_logger = "0.11.5"
19 changes: 19 additions & 0 deletions test-rustls-platform-verifier/src/main.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
#[tokio::main]
async fn main() -> Result<(), Box<dyn std::error::Error>> {
env_logger::init();

let client = reqwest::Client::builder()
.use_preconfigured_tls(rustls_platform_verifier::tls_config())
.build()
.expect("Build should not fail");
let request = client.get("https://httpbin.org/ip").build()?;
let response = client.execute(request).await?;

let status_code = response.status();
let content = response.text().await?;

println!("status_code = {status_code:?}");
println!("content = {content:?}");

Ok(())
}
Loading