Compare commits
No commits in common. "df9c033b3820f49e7467c15ab1dcff592016c9b6" and "c66a639eedfff06f57d8fd2bd977956605a018c7" have entirely different histories.
df9c033b38
...
c66a639eed
2 changed files with 19 additions and 22 deletions
|
@ -18,14 +18,11 @@ stages:
|
||||||
- cache-cleanup
|
- cache-cleanup
|
||||||
- build-base
|
- build-base
|
||||||
- build
|
- build
|
||||||
|
- version
|
||||||
- test
|
- test
|
||||||
|
|
||||||
# TEMPLATES
|
# 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:
|
.cargo-cleanup:
|
||||||
stage: cache-cleanup
|
stage: cache-cleanup
|
||||||
allow_failure: true
|
allow_failure: true
|
||||||
|
@ -33,15 +30,11 @@ stages:
|
||||||
- cargo install cargo-sweep
|
- cargo install cargo-sweep
|
||||||
- cargo sweep -i
|
- 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:
|
.cargo-build-base:
|
||||||
stage: build-base
|
stage: build-base
|
||||||
script:
|
script:
|
||||||
cargo build --locked
|
cargo build --locked
|
||||||
|
|
||||||
# build with various features on and off.
|
|
||||||
.cargo-build:
|
.cargo-build:
|
||||||
extends: .cargo-build-base
|
extends: .cargo-build-base
|
||||||
stage: build
|
stage: build
|
||||||
|
@ -56,7 +49,6 @@ stages:
|
||||||
script:
|
script:
|
||||||
cargo build --no-default-features --locked --features="json $FEATURES"
|
cargo build --no-default-features --locked --features="json $FEATURES"
|
||||||
|
|
||||||
# test with various features on and off.
|
|
||||||
.cargo-test:
|
.cargo-test:
|
||||||
extends: .cargo-build
|
extends: .cargo-build
|
||||||
stage: test
|
stage: test
|
||||||
|
@ -65,9 +57,6 @@ stages:
|
||||||
|
|
||||||
# LINT
|
# 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:
|
clippy:
|
||||||
stage: lint
|
stage: lint
|
||||||
script:
|
script:
|
||||||
|
@ -148,6 +137,14 @@ build-nightly:
|
||||||
- target
|
- target
|
||||||
- .cargo
|
- .cargo
|
||||||
|
|
||||||
|
# VERSION
|
||||||
|
|
||||||
|
fif-version:
|
||||||
|
stage: version
|
||||||
|
needs: ["build-stable"]
|
||||||
|
script:
|
||||||
|
cargo run -- -V
|
||||||
|
|
||||||
# TEST
|
# TEST
|
||||||
|
|
||||||
test-stable:
|
test-stable:
|
||||||
|
|
20
Cargo.lock
generated
20
Cargo.lock
generated
|
@ -166,9 +166,9 @@ checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "env_logger"
|
name = "env_logger"
|
||||||
version = "0.8.4"
|
version = "0.8.3"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "a19187fea3ac7e84da7dacf48de0c45d63c6a76f9490dae389aead16c243fce3"
|
checksum = "17392a012ea30ef05a610aa97dfb49496e71c9f676b27879922ea5bdf60d9d3f"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"atty",
|
"atty",
|
||||||
"log",
|
"log",
|
||||||
|
@ -268,9 +268,9 @@ dependencies = [
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "itertools"
|
name = "itertools"
|
||||||
version = "0.10.1"
|
version = "0.10.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "69ddb889f9d0d08a67338271fa9b62996bc788c7796a5c18cf057420aaed5eaf"
|
checksum = "37d572918e350e82412fe766d24b15e6682fb2ed2bbe018280caa810397cb319"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"either",
|
"either",
|
||||||
]
|
]
|
||||||
|
@ -302,9 +302,9 @@ dependencies = [
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "libc"
|
name = "libc"
|
||||||
version = "0.2.97"
|
version = "0.2.95"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "12b8adadd720df158f4d70dfe7ccc6adb0472d7c55ca83445f6a5ab3e36f8fb6"
|
checksum = "789da6d93f1b866ffe175afc5322a4d76c038605a1c3319bb57b06967ca98a36"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "log"
|
name = "log"
|
||||||
|
@ -441,9 +441,9 @@ dependencies = [
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "rand_chacha"
|
name = "rand_chacha"
|
||||||
version = "0.3.1"
|
version = "0.3.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88"
|
checksum = "e12735cf05c9e10bf21534da50a147b924d555dc7a547c42e6bb2d5b6017ae0d"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"ppv-lite86",
|
"ppv-lite86",
|
||||||
"rand_core",
|
"rand_core",
|
||||||
|
@ -599,9 +599,9 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "syn"
|
name = "syn"
|
||||||
version = "1.0.73"
|
version = "1.0.72"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "f71489ff30030d2ae598524f61326b902466f72a0fb1a8564c001cc63425bcc7"
|
checksum = "a1e8cdbefb79a9a5a65e0db8b47b723ee907b7c7f8496c76a1770b5c310bab82"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"proc-macro2",
|
"proc-macro2",
|
||||||
"quote",
|
"quote",
|
||||||
|
|
Loading…
Reference in a new issue