diff options
author | Eli Flanagan <eli@typedspace.com> | 2021-03-10 18:48:44 -0500 |
---|---|---|
committer | Eli Flanagan <eli@typedspace.com> | 2021-03-10 18:56:22 -0500 |
commit | 17f87e4cdf35307683734f2a2be557a58be94b08 (patch) | |
tree | 6a256473e6f009cbf551a63baf8b92fd27bbc5a2 | |
parent | 9f3f54439ea228d9ccf9f63f6281850f7264b476 (diff) |
ci: prefer --workspace flag
Close #660
The changelog documenting cargo's --workspace arrival is
[here](https://github.com/rust-lang/cargo/blob/61a31bc5ff290322d5c025bf750c56501999235d/CHANGELOG.md#added-13).
Note `cargo fmt` still expects `--all` because the subcommand semantics differ.
-rw-r--r-- | .gitlab-ci.yml | 2 | ||||
-rw-r--r-- | Makefile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2818c321..36364dfb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -112,7 +112,7 @@ windows-gnu: - rustc --version --verbose - cargo --version script: - - cargo test --all --exclude sequoia-openpgp-ffi + - cargo test --workspace --exclude sequoia-openpgp-ffi # https://github.com/rust-lang/cargo/issues/5015 - cargo test --manifest-path openpgp/Cargo.toml --no-default-features --features crypto-cng,compression after_script: [] @@ -11,7 +11,7 @@ CARGO_TARGET_DIR ?= $(shell pwd)/target # We currently only support absolute paths. CARGO_TARGET_DIR := $(abspath $(CARGO_TARGET_DIR)) # The packages to build, test and document, e.g., "-p sequoia-openpgp" -CARGO_PACKAGES ?= --all +CARGO_PACKAGES ?= --workspace # Additional arguments to pass to cargo test, e.g., "--doc". CARGO_TEST_ARGS ?= # Version as stated in the top-level Cargo.toml. |