Skip to content

Commit 4576002

Browse files
authored
Merge pull request #405 from mulkieran/cargo-minimal-versions
Remove all verify-dependency-bounds associated targets
2 parents 2c1ca05 + 9c70a9d commit 4576002

File tree

1 file changed

+8
-15
lines changed

1 file changed

+8
-15
lines changed

Makefile

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,12 @@ else
1414
CLIPPY_OPTS = --fix
1515
endif
1616

17+
ifeq ($(origin MINIMAL), undefined)
18+
BUILD = build
19+
else
20+
BUILD = minimal-versions build --direct
21+
endif
22+
1723
IGNORE_ARGS ?=
1824

1925
${HOME}/.cargo/bin/cargo-audit:
@@ -26,10 +32,10 @@ check-typos:
2632
typos
2733

2834
build:
29-
cargo build
35+
cargo ${BUILD}
3036

3137
build-examples:
32-
cargo build --examples
38+
cargo ${BUILD} --examples
3339

3440
test-compare-fedora-versions:
3541
echo "Testing that COMPARE_FEDORA_VERSIONS environment variable is set to a valid path"
@@ -38,16 +44,6 @@ test-compare-fedora-versions:
3844
check-fedora-versions: test-compare-fedora-versions
3945
${COMPARE_FEDORA_VERSIONS} ${MANIFEST_PATH_ARGS} ${FEDORA_RELEASE_ARGS} ${IGNORE_ARGS}
4046

41-
SET_LOWER_BOUNDS ?=
42-
test-set-lower-bounds:
43-
echo "Testing that SET_LOWER_BOUNDS environment variable is set to a valid path"
44-
test -e "${SET_LOWER_BOUNDS}"
45-
46-
verify-dependency-bounds: test-set-lower-bounds
47-
cargo build ${MANIFEST_PATH_ARGS} --all-features
48-
${SET_LOWER_BOUNDS} ${MANIFEST_PATH_ARGS}
49-
cargo build ${MANIFEST_PATH_ARGS} --all-features
50-
5147
clippy:
5248
(cd libcryptsetup-rs-sys && cargo clippy --all-features ${CARGO_OPTS})
5349
cargo clippy --all-features ${CARGO_OPTS}
@@ -99,7 +95,4 @@ yamllint:
9995
test-compare-fedora-versions
10096
test-loopback
10197
test-loopback-mutex
102-
test-set-lower-bounds
103-
verify-dependency-bounds
104-
verify-dependency-bounds-sys
10598
yamllint

0 commit comments

Comments
 (0)