Skip to content

Commit

Permalink
Merge branch 'mozilla:main' into specify-server-port
Browse files Browse the repository at this point in the history
  • Loading branch information
just-an-engineer authored Aug 13, 2024
2 parents f4cf2eb + 95455ad commit f07dc9b
Show file tree
Hide file tree
Showing 14 changed files with 170 additions and 206 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,9 @@ jobs:
- os: windows-2019
target: x86_64-pc-windows-msvc
rustflags: -Ctarget-feature=+crt-static
- os: windows-2019
target: aarch64-pc-windows-msvc
rustflags: -Ctarget-feature=+crt-static
steps:
- name: Clone repository
uses: actions/checkout@v4
Expand Down
138 changes: 51 additions & 87 deletions Cargo.lock

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

19 changes: 9 additions & 10 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -64,11 +64,11 @@ mime = "0.3"
num_cpus = "1.16"
number_prefix = "0.4"
once_cell = "1.19"
opendal = { version = "0.47.3", optional = true, default-features = false }
opendal = { version = "0.48.0", optional = true, default-features = false }
openssl = { version = "0.10.64", optional = true }
rand = "0.8.4"
regex = "1.10.3"
reqsign = { version = "0.15.2", optional = true }
reqsign = { version = "0.16.0", optional = true }
reqwest = { version = "0.12", features = [
"json",
"blocking",
Expand Down Expand Up @@ -140,16 +140,15 @@ daemonize = "0.5"
optional = true
version = "0.1.15"

[target.'cfg(windows)'.dependencies.winapi]
[target.'cfg(windows)'.dependencies.windows-sys]
features = [
"fileapi",
"handleapi",
"stringapiset",
"winnls",
"processenv",
"std",
"Win32_Foundation",
"Win32_Globalization",
"Win32_Storage_FileSystem",
"Win32_System_Threading",
"Win32_System_Console",
]
version = "0.3"
version = "0.52"

[features]
all = [
Expand Down
6 changes: 3 additions & 3 deletions src/cache/azure.rs
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ pub struct AzureBlobCache;

impl AzureBlobCache {
pub fn build(connection_string: &str, container: &str, key_prefix: &str) -> Result<Operator> {
let mut builder = Azblob::from_connection_string(connection_string)?;
builder.container(container);
builder.root(key_prefix);
let builder = Azblob::from_connection_string(connection_string)?
.container(container)
.root(key_prefix);

let op = Operator::new(builder)?
.layer(LoggingLayer::default())
Expand Down
Loading

0 comments on commit f07dc9b

Please sign in to comment.