Skip to content

update some packages #84

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

Merged
merged 1 commit into from
Jun 23, 2024
Merged
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
11 changes: 10 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Changed

- updated `toml` dependency to 0.8.
- Update `attohttpc` dependency to 0.28
- Update `base64` dependency to 0.22
- Update `env_logger` dependency to 0.11
- Update `git2` dependency to 0.19
- Update `http ` dependency to 1.1
- Update `nix` dependency to 0.29
- Update `remove_dir_all` dependency to 0.8
- Update `toml` dependency to 0.8.
- Update `tiny_http` dependency to 0.12
- Update `windows-sys` dependency to 0.52

## [0.16.0] - 2023-05-02

Expand Down
18 changes: 9 additions & 9 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ unstable = []
unstable-toolchain-ci = []

[dependencies]
http = "0.2"
http = "1.1.0"
failure = "0.1.3"
futures-util = "0.3.5"
log = "0.4.6"
Expand All @@ -28,26 +28,26 @@ serde_json = "1.0"
scopeguard = "1.0.0"
lazy_static = "1.0.0"
tempfile = "3.0.0"
attohttpc = "0.16"
attohttpc = "0.28.0"
flate2 = "1"
tar = "0.4.0"
percent-encoding = "2.1.0"
walkdir = "2.2"
toml = "0.8.12"
fs2 = "0.4.3"
remove_dir_all = "0.7"
base64 = "0.13.0"
remove_dir_all = "0.8.2"
base64 = "0.22.0"
getrandom = { version = "0.2", features = ["std"] }
thiserror = "1.0.20"
git2 = "0.17.0"
git2 = "0.19.0"

[target.'cfg(unix)'.dependencies]
nix = "0.25.0"
nix = { version = "0.29.0", features = ["signal", "user"]}

[target.'cfg(windows)'.dependencies]
windows-sys = {version = "0.36.1", features = ["Win32_Foundation", "Win32_System_Threading"]}
windows-sys = {version = "0.52.0", features = ["Win32_Foundation", "Win32_System_Threading"]}

[dev-dependencies]
env_logger = "0.8"
env_logger = "0.11.3"
rand = "0.8.5"
tiny_http = "0.8.0"
tiny_http = "0.12.0"
3 changes: 2 additions & 1 deletion src/inside_docker.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
use crate::cmd::Command;
use crate::workspace::Workspace;
use base64::{engine::general_purpose::STANDARD as b64, Engine};
use failure::Error;
use getrandom::getrandom;
use log::info;
Expand Down Expand Up @@ -52,7 +53,7 @@ pub(crate) fn probe_container_id(workspace: &Workspace) -> Result<Option<String>
let probe_path_str = probe_path.to_str().unwrap();
let mut probe_content = [0u8; 64];
getrandom(&mut probe_content)?;
let probe_content = base64::encode(&probe_content[..]);
let probe_content = b64.encode(&probe_content[..]);
std::fs::write(&probe_path, probe_content.as_bytes())?;

// Check if the probe exists on any of the currently running containers.
Expand Down
6 changes: 5 additions & 1 deletion tests/integration/crates_git.rs
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,11 @@ impl Repo {
fn serve(&self) -> Result<String, Error> {
let server =
tiny_http::Server::http("localhost:0").map_err(|e| failure::err_msg(e.to_string()))?;
let port = server.server_addr().port();
let port = if let tiny_http::ListenAddr::IP(socket_addr) = server.server_addr() {
socket_addr.port()
} else {
failure::bail!("found a non-IP server address");
};

let base = self.source.path().join(".git");
let require_auth = self.require_auth;
Expand Down
Loading