Compare commits

...

2 Commits

Author SHA1 Message Date
Lynne Megido df9c033b38
cargo update
All checks were successful
continuous-integration/drone/push Build is passing
2021-06-13 16:47:39 +10:00
Lynne Megido 0c8c58366f
add comments to gitlab CI, remove useless version stage 2021-06-13 16:47:20 +10:00
2 changed files with 22 additions and 19 deletions

View File

@ -18,11 +18,14 @@ stages:
- cache-cleanup
- build-base
- build
- version
- test
# TEMPLATES
# this step uses cargo-sweep to clean up unneeded cruft that accumulates over time in the target dir. cargo clean is
# not used because it simply rm -rf's the entire target directory (and thus prevents build caching). i would really like
# to either replace this with a bash script, or to install cargo-sweep as a binary instead of building it from source
# like this. i'd also like to add a step that checks to see whether the target dir exists, and exits early if not.
.cargo-cleanup:
stage: cache-cleanup
allow_failure: true
@ -30,11 +33,15 @@ stages:
- cargo install cargo-sweep
- cargo sweep -i
# this builds a "base" version of fif with default features enabled. this is done separately from the main build step
# for the purposes of caching - by building once *before* executing the parallel cargo-build step, we ensure that
# cargo-build can reuse some cached stuff, rather than building from scratch every time.
.cargo-build-base:
stage: build-base
script:
cargo build --locked
# build with various features on and off.
.cargo-build:
extends: .cargo-build-base
stage: build
@ -49,6 +56,7 @@ stages:
script:
cargo build --no-default-features --locked --features="json $FEATURES"
# test with various features on and off.
.cargo-test:
extends: .cargo-build
stage: test
@ -57,6 +65,9 @@ stages:
# LINT
# run the included clippy.sh with "ci" mode on - clippy will exit with code 1 if anything at all is amiss. this is just
# here to make sure i remember to run clippy.sh locally myself and fix/ignore all the warnings before committing, as i
# should be.
clippy:
stage: lint
script:
@ -137,14 +148,6 @@ build-nightly:
- target
- .cargo
# VERSION
fif-version:
stage: version
needs: ["build-stable"]
script:
cargo run -- -V
# TEST
test-stable:

20
Cargo.lock generated
View File

@ -166,9 +166,9 @@ checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"
[[package]]
name = "env_logger"
version = "0.8.3"
version = "0.8.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "17392a012ea30ef05a610aa97dfb49496e71c9f676b27879922ea5bdf60d9d3f"
checksum = "a19187fea3ac7e84da7dacf48de0c45d63c6a76f9490dae389aead16c243fce3"
dependencies = [
"atty",
"log",
@ -268,9 +268,9 @@ dependencies = [
[[package]]
name = "itertools"
version = "0.10.0"
version = "0.10.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "37d572918e350e82412fe766d24b15e6682fb2ed2bbe018280caa810397cb319"
checksum = "69ddb889f9d0d08a67338271fa9b62996bc788c7796a5c18cf057420aaed5eaf"
dependencies = [
"either",
]
@ -302,9 +302,9 @@ dependencies = [
[[package]]
name = "libc"
version = "0.2.95"
version = "0.2.97"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "789da6d93f1b866ffe175afc5322a4d76c038605a1c3319bb57b06967ca98a36"
checksum = "12b8adadd720df158f4d70dfe7ccc6adb0472d7c55ca83445f6a5ab3e36f8fb6"
[[package]]
name = "log"
@ -441,9 +441,9 @@ dependencies = [
[[package]]
name = "rand_chacha"
version = "0.3.0"
version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e12735cf05c9e10bf21534da50a147b924d555dc7a547c42e6bb2d5b6017ae0d"
checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
dependencies = [
"ppv-lite86",
"rand_core",
@ -599,9 +599,9 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
[[package]]
name = "syn"
version = "1.0.72"
version = "1.0.73"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a1e8cdbefb79a9a5a65e0db8b47b723ee907b7c7f8496c76a1770b5c310bab82"
checksum = "f71489ff30030d2ae598524f61326b902466f72a0fb1a8564c001cc63425bcc7"
dependencies = [
"proc-macro2",
"quote",