Skip to content

Commit

Permalink
back to nightly
Browse files Browse the repository at this point in the history
  • Loading branch information
mvines committed Dec 18, 2018
1 parent 3fbe576 commit e56d93a
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 7 deletions.
2 changes: 1 addition & 1 deletion ci/buildkite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ steps:
#- command: "ci/docker-run.sh solanalabs/rust:1.31.0 ci/test-stable.sh"
# name: "stable"
# timeout_in_minutes: 30
- command: "ci/docker-run.sh solanalabs/rust:1.31.0 ci/test-nightly.sh"
- command: "ci/docker-run.sh solanalabs/rust-nightly:2018-12-05 ci/test-nightly.sh"
name: "nightly"
timeout_in_minutes: 30
# TODO: Fix and re-enable test-large-network.sh
Expand Down
5 changes: 2 additions & 3 deletions ci/test-nightly.sh
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,12 @@ source ci/upload-ci-artifact.sh
ci/version-check.sh nightly

scripts/coverage.sh
_ upload-ci-artifact target/cov/report.tar.gz

echo "--- codecov.io report"
if [[ -z "$CODECOV_TOKEN" ]]; then
echo "^^^ +++"
echo CODECOV_TOKEN undefined, codecov.io upload skipped
else
bash <(curl -s https://codecov.io/bash) -X gcov -f lcov.info
bash <(curl -s https://codecov.io/bash) -X gcov -f target/cov/lcov.info
fi

_ upload-ci-artifact target/cov/report.tar.gz
8 changes: 5 additions & 3 deletions scripts/coverage.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#

set -e
cd "$(dirname "$0")"
cd "$(dirname "$0")/.."

_() {
echo "--- $*"
Expand All @@ -33,10 +33,12 @@ if [[ -d target/cov ]]; then
fi
rm -rf target/cov/$reportName

[[ -n $BUILDKITE ]] || maybeNightly="+nightly"

# TODO: why does |cargo cov| "appear" to work on stable?
_ cargo +nightly build --target-dir target/cov --all
_ cargo $maybeNightly build --target-dir target/cov --all
# TODO: why does |test| cause a partial rebuild?
_ cargo +nightly test --target-dir target/cov --lib --all
_ cargo $maybeNightly test --target-dir target/cov --lib --all

_ scripts/fetch-grcov.sh
echo "--- grcov"
Expand Down

0 comments on commit e56d93a

Please sign in to comment.