File tree 4 files changed +26
-12
lines changed
4 files changed +26
-12
lines changed Original file line number Diff line number Diff line change @@ -12,7 +12,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
12
12
13
13
### Changed
14
14
15
- - updated ` toml ` dependency to 0.8.
15
+ - Update ` attohttpc ` dependency to 0.28
16
+ - Update ` base64 ` dependency to 0.22
17
+ - Update ` env_logger ` dependency to 0.11
18
+ - Update ` git2 ` dependency to 0.19
19
+ - Update ` http ` dependency to 1.1
20
+ - Update ` nix ` dependency to 0.29
21
+ - Update ` remove_dir_all ` dependency to 0.8
22
+ - Update ` toml ` dependency to 0.8.
23
+ - Update ` tiny_http ` dependency to 0.12
24
+ - Update ` windows-sys ` dependency to 0.52
16
25
17
26
## [ 0.16.0] - 2023-05-02
18
27
Original file line number Diff line number Diff line change @@ -17,7 +17,7 @@ unstable = []
17
17
unstable-toolchain-ci = []
18
18
19
19
[dependencies ]
20
- http = " 0.2 "
20
+ http = " 1.1.0 "
21
21
failure = " 0.1.3"
22
22
futures-util = " 0.3.5"
23
23
log = " 0.4.6"
@@ -28,26 +28,26 @@ serde_json = "1.0"
28
28
scopeguard = " 1.0.0"
29
29
lazy_static = " 1.0.0"
30
30
tempfile = " 3.0.0"
31
- attohttpc = " 0.16 "
31
+ attohttpc = " 0.28.0 "
32
32
flate2 = " 1"
33
33
tar = " 0.4.0"
34
34
percent-encoding = " 2.1.0"
35
35
walkdir = " 2.2"
36
36
toml = " 0.8.12"
37
37
fs2 = " 0.4.3"
38
- remove_dir_all = " 0.7 "
39
- base64 = " 0.13 .0"
38
+ remove_dir_all = " 0.8.2 "
39
+ base64 = " 0.22 .0"
40
40
getrandom = { version = " 0.2" , features = [" std" ] }
41
41
thiserror = " 1.0.20"
42
- git2 = " 0.17 .0"
42
+ git2 = " 0.19 .0"
43
43
44
44
[target .'cfg(unix)' .dependencies ]
45
- nix = " 0.25 .0"
45
+ nix = { version = " 0.29 .0" , features = [ " signal " , " user " ]}
46
46
47
47
[target .'cfg(windows)' .dependencies ]
48
- windows-sys = {version = " 0.36.1 " , features = [" Win32_Foundation" , " Win32_System_Threading" ]}
48
+ windows-sys = {version = " 0.52.0 " , features = [" Win32_Foundation" , " Win32_System_Threading" ]}
49
49
50
50
[dev-dependencies ]
51
- env_logger = " 0.8 "
51
+ env_logger = " 0.11.3 "
52
52
rand = " 0.8.5"
53
- tiny_http = " 0.8 .0"
53
+ tiny_http = " 0.12 .0"
Original file line number Diff line number Diff line change 1
1
use crate :: cmd:: Command ;
2
2
use crate :: workspace:: Workspace ;
3
+ use base64:: { engine:: general_purpose:: STANDARD as b64, Engine } ;
3
4
use failure:: Error ;
4
5
use getrandom:: getrandom;
5
6
use log:: info;
@@ -52,7 +53,7 @@ pub(crate) fn probe_container_id(workspace: &Workspace) -> Result<Option<String>
52
53
let probe_path_str = probe_path. to_str ( ) . unwrap ( ) ;
53
54
let mut probe_content = [ 0u8 ; 64 ] ;
54
55
getrandom ( & mut probe_content) ?;
55
- let probe_content = base64 :: encode ( & probe_content[ ..] ) ;
56
+ let probe_content = b64 . encode ( & probe_content[ ..] ) ;
56
57
std:: fs:: write ( & probe_path, probe_content. as_bytes ( ) ) ?;
57
58
58
59
// Check if the probe exists on any of the currently running containers.
Original file line number Diff line number Diff line change @@ -128,7 +128,11 @@ impl Repo {
128
128
fn serve ( & self ) -> Result < String , Error > {
129
129
let server =
130
130
tiny_http:: Server :: http ( "localhost:0" ) . map_err ( |e| failure:: err_msg ( e. to_string ( ) ) ) ?;
131
- let port = server. server_addr ( ) . port ( ) ;
131
+ let port = if let tiny_http:: ListenAddr :: IP ( socket_addr) = server. server_addr ( ) {
132
+ socket_addr. port ( )
133
+ } else {
134
+ failure:: bail!( "found a non-IP server address" ) ;
135
+ } ;
132
136
133
137
let base = self . source . path ( ) . join ( ".git" ) ;
134
138
let require_auth = self . require_auth ;
You can’t perform that action at this time.
0 commit comments