Skip to content

Commit a70d98a

Browse files
Merge pull request #298 from BraneFramework/ci
CI
2 parents 73ce571 + f7590d5 commit a70d98a

File tree

7 files changed

+50
-121
lines changed

7 files changed

+50
-121
lines changed

.cargo/audit.toml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
[advisories]
2+
ignore = [
3+
"RUSTSEC-2024-0436" # See: https://github.com/rustsec/advisory-db/pull/2215#issuecomment-2709315704
4+
]

Cargo.lock

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

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,8 +106,8 @@ strum = { version = "0.27.0" }
106106
thiserror = { version = "2.0.0" }
107107
tokio = { version = "1.44.2", default-features = false }
108108
tonic = { version = "0.13.0" }
109-
tracing = { version = "0.1.37" }
110-
tracing-subscriber = { version = "0.3.10", features = ["env-filter"] }
109+
tracing = { version = "0.1.41" }
110+
tracing-subscriber = { version = "0.3.20", features = ["env-filter"] }
111111
warp = { version = "0.3.2" }
112112

113113
# Brane

brane-cli/src/run.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -757,7 +757,7 @@ pub async fn handle(
757757
keep_containers: bool,
758758
) -> Result<(), Error> {
759759
// Either read the file or read stdin
760-
let (source, source_code): (Cow<str>, String) = if file == PathBuf::from("-") {
760+
let (source, source_code): (Cow<str>, String) = if file == Path::new("-") {
761761
let mut result: String = String::new();
762762
std::io::stdin().read_to_string(&mut result).map_err(|source| Error::StdinReadError { source })?;
763763
("<stdin>".into(), result)

brane-prx/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ license.workspace = true
99

1010
[dependencies]
1111
never-say-never = "6.6.666"
12-
socksx = { git = "https://github.com/braneframework/socksx", tag = "v2.0.0" }
12+
socksx = { git = "https://github.com/braneframework/socksx", tag = "v2.0.1" }
1313
tokio-rustls = "0.24.0"
1414
url = "2.5.0"
1515

brane-tsk/src/docker.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -967,7 +967,7 @@ pub async fn get_digest(path: impl AsRef<Path>) -> Result<String, Error> {
967967
return Err(Error::ImageTarIllegalPath { path: path.to_path_buf(), source });
968968
},
969969
};
970-
if entry_path == PathBuf::from("manifest.json") {
970+
if entry_path == Path::new("manifest.json") {
971971
// Try to read it
972972
let mut manifest: Vec<u8> = vec![];
973973
entry.read_to_end(&mut manifest).await.map_err(|source| Error::ImageTarManifestReadError {

0 commit comments

Comments
 (0)