From 036abd50acbef420fbec6f9ffea88ac834c0c9a8 Mon Sep 17 00:00:00 2001 From: Deirdre Connolly Date: Fri, 20 Nov 2020 16:02:45 -0500 Subject: [PATCH] Back to stable for test image --- .github/workflows/test.yml | 2 +- docker/Dockerfile.test | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 0168e7dc..9eb7ae67 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -63,7 +63,7 @@ jobs: - name: Run all tests run: | gcloud compute ssh "zebrad-tests-$BRANCH_NAME-$SHORT_SHA" --zone "$ZONE" \ - --command "git clone -b $BRANCH_NAME https://github.com/ZcashFoundation/zebra.git; cd zebra/; docker build -f docker/Dockerfile.test -t zebrad-test .; docker run -i zebrad-test cargo +nightly test --all --no-fail-fast -- -Zunstable-options --include-ignored --skip kill_on_timeout" + --command "git clone -b $BRANCH_NAME https://github.com/ZcashFoundation/zebra.git; cd zebra/; docker build -f docker/Dockerfile.test -t zebrad-test .; docker run -i zebrad-test cargo test --workspace --no-fail-fast -- -Zunstable-options --include-ignored --skip kill_on_timeout" # Clean up - name: Delete test instance diff --git a/docker/Dockerfile.test b/docker/Dockerfile.test index 40d48386..8a7838af 100644 --- a/docker/Dockerfile.test +++ b/docker/Dockerfile.test @@ -1,4 +1,4 @@ -FROM rustlang/rust:nightly +FROM rust:buster RUN apt-get update && \ apt-get install -y --no-install-recommends \ @@ -16,5 +16,4 @@ EXPOSE 8233 18233 COPY . . -# Filtering to only run integration tests requires nightly for now -CMD cargo +nightly test --all --no-fail-fast -- -Zunstable-options --include-ignored +CMD cargo test --workspace --no-fail-fast -- -Zunstable-options --include-ignored