Skip to content
This repository was archived by the owner on Mar 23, 2021. It is now read-only.

Commit 1910652

Browse files
Make unix-socket of shiplift a default feature
This allows the use of `cargo` on *nix systems without having to pass any additional features.
1 parent c8357ca commit 1910652

File tree

3 files changed

+23
-3
lines changed

3 files changed

+23
-3
lines changed

Cargo.lock

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

Cargo.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@ tokio = "0.1"
3232
toml = "0.5"
3333
web3 = { version = "0.8", default-features = false, features = ["http"] }
3434

35+
[features]
36+
default = ["shiplift/unix-socket"]
37+
3538
[build-dependencies]
3639
anyhow = "1.0.23"
3740
flate2 = "1.0.13"

Makefile

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,10 @@ CARGO = $(RUSTUP) run --install $(TOOLCHAIN) cargo --color always
66
NIGHTLY_TOOLCHAIN = "nightly-2019-07-31"
77
CARGO_NIGHTLY = $(RUSTUP) run --install $(NIGHTLY_TOOLCHAIN) cargo --color always
88

9-
ifneq ($(OS),Windows_NT)
10-
BUILD_ARGS := --features shiplift/unix-socket
9+
# cannot use the unix-socket to talk to the docker daemon on windows
10+
ifeq ($(OS),Windows_NT)
11+
BUILD_ARGS := --no-default-features
12+
TEST_ARGS := --no-default-features
1113
endif
1214

1315
build: build_debug
@@ -55,7 +57,7 @@ clippy: install_clippy
5557
$(CARGO) clippy --all-targets -- -D warnings
5658

5759
test:
58-
$(CARGO) test --all
60+
$(CARGO) test --all $(TEST_ARGS)
5961

6062
doc:
6163
$(CARGO) doc

0 commit comments

Comments
 (0)