Skip to content

Commit

Permalink
remove references to dependency-tasks in CI and Cargo files
Browse files Browse the repository at this point in the history
  • Loading branch information
pls148 committed Oct 11, 2024
1 parent 300d0eb commit c9b6652
Show file tree
Hide file tree
Showing 7 changed files with 3 additions and 70 deletions.
44 changes: 0 additions & 44 deletions .github/workflows/build-and-test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59,50 +59,6 @@ jobs:
timeout-minutes: 60
env:
RUST_BACKTRACE: full
test-dependency-tasks:
strategy:
matrix:
just_variants:
- async-std
- tokio
test_suites:
- test-ci-1
- test-ci-2
- test-ci-3
- test-ci-4
- test-ci-5
- test-ci-rest
fail-fast: false
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
name: Checkout Repository

- name: Install Rust
uses: mkroening/rust-toolchain-toml@main

- uses: Swatinem/rust-cache@v2
name: Enable Rust Caching
with:
shared-key: "test"
prefix-key: ${{ matrix.just_variants }}
cache-on-failure: "true"
save-if: "false"

- name: Install Just
run: |
wget https://github.com/casey/just/releases/download/1.14.0/just-1.14.0-x86_64-unknown-linux-musl.tar.gz
tar -vxf just-1.14.0-x86_64-unknown-linux-musl.tar.gz just
sudo cp just /usr/bin/just
- uses: taiki-e/install-action@nextest

- name: Unit and integration tests for all crates in workspace
run: |
just ${{ matrix.just_variants }} ${{ matrix.test_suites }} --features dependency-tasks
timeout-minutes: 60
env:
RUST_BACKTRACE: full

test-examples:
strategy:
Expand Down
1 change: 0 additions & 1 deletion crates/hotshot/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ rust-version = { workspace = true }
default = ["docs", "doc-images"]
example-upgrade = ["hotshot-task-impls/example-upgrade"]
gpu-vid = ["hotshot-task-impls/gpu-vid"]
dependency-tasks = ["hotshot-task-impls/dependency-tasks"]
rewind = ["hotshot-task-impls/rewind"]

# Features required for binaries
Expand Down
1 change: 0 additions & 1 deletion crates/task-impls/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ version = { workspace = true }
[features]
example-upgrade = []
gpu-vid = ["hotshot-types/gpu-vid"]
dependency-tasks = []
rewind = []
test-srs = ["jf-vid/test-srs"]

Expand Down
1 change: 0 additions & 1 deletion crates/testing/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ default = []
# NOTE this is used to activate the slow tests we don't wish to run in CI
slow-tests = []
gpu-vid = ["hotshot-types/gpu-vid"]
dependency-tasks = ["hotshot/dependency-tasks"]
rewind = ["hotshot/rewind"]
test-srs = ["jf-vid/test-srs"]

Expand Down
1 change: 0 additions & 1 deletion crates/testing/tests/tests_1/upgrade_task_with_proposal.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
// You should have received a copy of the MIT License
// along with the HotShot repository. If not, see <https://mit-license.org/>.

// TODO: Remove after integration of dependency-tasks
#![allow(unused_imports)]

use std::time::Duration;
Expand Down
1 change: 0 additions & 1 deletion crates/testing/tests/tests_1/upgrade_task_with_vote.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
// You should have received a copy of the MIT License
// along with the HotShot repository. If not, see <https://mit-license.org/>.

// TODO: Remove after integration of dependency-tasks
#![allow(unused_imports)]

use std::time::Duration;
Expand Down
24 changes: 3 additions & 21 deletions justfile
Original file line number Diff line number Diff line change
Expand Up @@ -92,10 +92,6 @@ test_success:
echo Testing success test
cargo test --lib --bins --tests --benches --workspace --no-fail-fast test_success -- --test-threads=1 --nocapture

test_success_dependency_tasks:
echo Testing success test
cargo test --lib --bins --tests --benches --workspace --no-fail-fast --features "dependency-tasks" test_success -- --test-threads=1 --nocapture

test_timeout:
echo Testing timeout test
cargo test --lib --bins --tests --benches --workspace --no-fail-fast test_timeout -- --test-threads=1 --nocapture
Expand All @@ -112,10 +108,6 @@ test_with_failures:
echo Testing nodes leaving the network
cargo test --lib --bins --tests --benches --workspace --no-fail-fast test_with_failures -- --test-threads=1 --nocapture

test_with_failures_dependency_tasks:
echo Testing nodes leaving the network with dependency tasks
cargo test --lib --bins --tests --benches --workspace --no-fail-fast --features "dependency-tasks" test_with_failures -- --test-threads=1 --nocapture

test_network_task:
echo Testing the DA task
cargo test --lib --bins --tests --benches --workspace --no-fail-fast test_network_task -- --test-threads=1 --nocapture
Expand All @@ -130,11 +122,11 @@ test_consensus_task:

test_quorum_vote_task:
echo Testing the quorum vote task
cargo test --lib --bins --tests --benches --workspace --no-fail-fast --features "dependency-tasks" test_quorum_vote_task -- --test-threads=1 --nocapture
cargo test --lib --bins --tests --benches --workspace --no-fail-fast test_quorum_vote_task -- --test-threads=1 --nocapture

test_quorum_proposal_task:
echo Testing the quorum proposal task
cargo test --lib --bins --tests --benches --workspace --no-fail-fast --features "dependency-tasks" test_quorum_proposal_task -- --test-threads=1 --nocapture
cargo test --lib --bins --tests --benches --workspace --no-fail-fast test_quorum_proposal_task -- --test-threads=1 --nocapture

test_da_task:
echo Testing the DA task
Expand All @@ -150,16 +142,12 @@ test_view_sync_task:

test_quorum_proposal_recv_task:
echo Testing the quorum proposal recv task
cargo test --lib --bins --tests --benches --workspace --no-fail-fast --features "dependency-tasks" test_quorum_proposal_recv_task -- --test-threads=1 --nocapture
cargo test --lib --bins --tests --benches --workspace --no-fail-fast test_quorum_proposal_recv_task -- --test-threads=1 --nocapture

test_upgrade_task:
echo Testing the upgrade task without dependency tasks
cargo test --lib --bins --tests --benches --workspace --no-fail-fast test_upgrade_task -- --test-threads=1 --nocapture

test_upgrade_task_dependency_tasks:
echo Testing the upgrade task without dependency tasks
cargo test --lib --bins --tests --benches --workspace --no-fail-fast --features "dependency-tasks" test_upgrade_task -- --test-threads=1 --nocapture

test_pkg := "hotshot"

default_test := ""
Expand All @@ -186,10 +174,6 @@ clippy:
echo clippy
cargo clippy --workspace --examples --bins --tests -- -D warnings

clippy_dependency_tasks:
echo clippy release
cargo clippy --workspace --examples --bins --tests --features "dependency-tasks" -- -D warnings

clippy_release:
echo clippy release
cargo clippy --package hotshot --no-default-features --features="docs, doc-images" -- -D warnings
Expand All @@ -210,8 +194,6 @@ lint_release: clippy_release fmt_check

fmt_clippy: fmt clippy

fmt_clippy_dependency_tasks: fmt clippy_dependency_tasks

careful:
echo Careful-ing with tokio executor
cargo careful test --profile careful --lib --bins --tests --benches --workspace --no-fail-fast -- --test-threads=1 --nocapture
Expand Down

0 comments on commit c9b6652

Please sign in to comment.