diff --git a/.github/actions/install-capnp/action.yml b/.github/actions/install-capnp/action.yml deleted file mode 100644 index a0e9be832..000000000 --- a/.github/actions/install-capnp/action.yml +++ /dev/null @@ -1,8 +0,0 @@ -name: Install Capn Proto -runs: - using: composite - steps: - - run: | - sudo apt-get update - sudo apt-get install -y capnproto - shell: bash diff --git a/.github/workflows/audit.yml b/.github/workflows/audit.yml index cb1e2979d..3e87874b0 100644 --- a/.github/workflows/audit.yml +++ b/.github/workflows/audit.yml @@ -21,9 +21,6 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - - name: Install capnproto - uses: ./.github/actions/install-capnp # See https://github.com/rustsec/audit-check for docs - uses: rustsec/audit-check@v1 diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index a85c916ff..56745779b 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -47,9 +47,6 @@ jobs: with: prefix-key: v1-rust - - name: Install capnproto - uses: ./.github/actions/install-capnp - - name: Build # Build in release without `testing` feature, this should work without `hotshot_example` config. run: | @@ -87,10 +84,6 @@ jobs: with: submodules: recursive - - name: Install Capn Proto - run: | - apt-get update && apt-get install -y capnproto - - name: Enable Rust Caching uses: Swatinem/rust-cache@v2 diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 1450b3e4d..67e48ebfd 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -30,9 +30,6 @@ jobs: - uses: Swatinem/rust-cache@v2 name: Enable Rust Caching - - name: Install capnproto - uses: ./.github/actions/install-capnp - - name: Format Check run: cargo fmt -- --check diff --git a/.github/workflows/test-demo-native.yml b/.github/workflows/test-demo-native.yml index 3e8d56456..e4d404ecc 100644 --- a/.github/workflows/test-demo-native.yml +++ b/.github/workflows/test-demo-native.yml @@ -43,9 +43,6 @@ jobs: - name: Enable Rust Caching uses: Swatinem/rust-cache@v2 - - name: Install capnproto - uses: ./.github/actions/install-capnp - - name: Build run: cargo build --release diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 129818907..2c1ff5d28 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -47,9 +47,6 @@ jobs: - name: Enable Rust Caching uses: Swatinem/rust-cache@v2 - - name: Install capnproto - uses: ./.github/actions/install-capnp - - name: Test # Build test binary with `testing` feature, which requires `hotshot_example` config run: | diff --git a/.github/workflows/unused-deps.yml b/.github/workflows/unused-deps.yml index d7dfba513..e3bf06207 100644 --- a/.github/workflows/unused-deps.yml +++ b/.github/workflows/unused-deps.yml @@ -23,9 +23,6 @@ jobs: - uses: Swatinem/rust-cache@v2 - - name: Install capnproto - uses: ./.github/actions/install-capnp - - name: Run cargo-udeps uses: aig787/cargo-udeps-action@v1 with: diff --git a/cross-shell.nix b/cross-shell.nix index ac88cc84b..b9b3949d9 100644 --- a/cross-shell.nix +++ b/cross-shell.nix @@ -16,7 +16,6 @@ pkgs.mkShell { # Crate dependencies cargoDeps.openssl-sys protobuf # required by libp2p - capnproto openssh ]; diff --git a/doc/ubuntu.md b/doc/ubuntu.md index 24e980011..fe991848b 100644 --- a/doc/ubuntu.md +++ b/doc/ubuntu.md @@ -5,7 +5,7 @@ ## Install system dependencies sudo apt-get update - sudo apt-get install -y curl cmake pkg-config libssl-dev protobuf-compiler git postgresql-client lsb-release gpg capnproto + sudo apt-get install -y curl cmake pkg-config libssl-dev protobuf-compiler git postgresql-client lsb-release gpg ## Install just diff --git a/flake.nix b/flake.nix index 0ad8aea30..7736b430d 100644 --- a/flake.nix +++ b/flake.nix @@ -189,7 +189,6 @@ protobuf # to compile libp2p-autonat stableToolchain jq - capnproto # Rust tools cargo-audit @@ -252,7 +251,6 @@ curl protobuf # to compile libp2p-autonat toolchain - capnproto ]; inherit RUST_LOG RUST_BACKTRACE RUSTFLAGS CARGO_TARGET_DIR; }; @@ -267,7 +265,6 @@ openssl curl protobuf # to compile libp2p-autonat - capnproto toolchain grcov ]; @@ -292,7 +289,6 @@ openssl curl protobuf # to compile libp2p-autonat - capnproto stableToolchain ]; inherit RUST_LOG RUST_BACKTRACE RUSTFLAGS CARGO_TARGET_DIR;