From b4e40ded93d9dbad26991385e69a85993a82798e Mon Sep 17 00:00:00 2001 From: Victor Koenders Date: Mon, 7 Mar 2022 17:15:13 +0100 Subject: [PATCH 1/2] Merged libp2p-networking and phaselock's .github folder --- .../.github => .github}/actions-rs/grcov.yml | 0 .github/dependabot.yml | 7 ++++++- .../workflows/build_libp2p_networking.yml | 2 +- .../workflows/coverage_libp2p_networking.yml | 2 +- libp2p-networking/.github/dependabot.yml | 11 ----------- 5 files changed, 8 insertions(+), 14 deletions(-) rename {libp2p-networking/.github => .github}/actions-rs/grcov.yml (100%) rename libp2p-networking/.github/workflows/build.yml => .github/workflows/build_libp2p_networking.yml (97%) rename libp2p-networking/.github/workflows/coverage.yml => .github/workflows/coverage_libp2p_networking.yml (97%) delete mode 100644 libp2p-networking/.github/dependabot.yml diff --git a/libp2p-networking/.github/actions-rs/grcov.yml b/.github/actions-rs/grcov.yml similarity index 100% rename from libp2p-networking/.github/actions-rs/grcov.yml rename to .github/actions-rs/grcov.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 9f0a052da1..0218212ac4 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -8,4 +8,9 @@ updates: - package-ecosystem: "cargo" directory: "/" schedule: - interval: "daily" \ No newline at end of file + interval: "daily" + + - package-ecosystem: "cargo" + directory: "/libp2p-networking" + schedule: + interval: "daily" diff --git a/libp2p-networking/.github/workflows/build.yml b/.github/workflows/build_libp2p_networking.yml similarity index 97% rename from libp2p-networking/.github/workflows/build.yml rename to .github/workflows/build_libp2p_networking.yml index 8b8c2be799..9ce38f35d1 100644 --- a/libp2p-networking/.github/workflows/build.yml +++ b/.github/workflows/build_libp2p_networking.yml @@ -1,4 +1,4 @@ -name: Build +name: Build (libp2p-networking) on: push: diff --git a/libp2p-networking/.github/workflows/coverage.yml b/.github/workflows/coverage_libp2p_networking.yml similarity index 97% rename from libp2p-networking/.github/workflows/coverage.yml rename to .github/workflows/coverage_libp2p_networking.yml index 71b2d478bd..20ecd6fbb3 100644 --- a/libp2p-networking/.github/workflows/coverage.yml +++ b/.github/workflows/coverage_libp2p_networking.yml @@ -1,4 +1,4 @@ -name: Code Coverage +name: Code Coverage (libp2p-newtorking) on: push: diff --git a/libp2p-networking/.github/dependabot.yml b/libp2p-networking/.github/dependabot.yml deleted file mode 100644 index d69e05329a..0000000000 --- a/libp2p-networking/.github/dependabot.yml +++ /dev/null @@ -1,11 +0,0 @@ -version: 2 -updates: - - package-ecosystem: "github-actions" - directory: "/" - schedule: - interval: "daily" - - - package-ecosystem: "cargo" - directory: "/" - schedule: - interval: "daily" From 16438e4c5ac387cec8f21d299cb31d5754eabf84 Mon Sep 17 00:00:00 2001 From: Victor Koenders Date: Mon, 7 Mar 2022 17:30:42 +0100 Subject: [PATCH 2/2] Fixed links in libp2p_networking CI --- .github/workflows/build_libp2p_networking.yml | 14 +++++---- .../workflows/coverage_libp2p_networking.yml | 29 ++++++++++--------- 2 files changed, 23 insertions(+), 20 deletions(-) diff --git a/.github/workflows/build_libp2p_networking.yml b/.github/workflows/build_libp2p_networking.yml index 9ce38f35d1..d942c2b64c 100644 --- a/.github/workflows/build_libp2p_networking.yml +++ b/.github/workflows/build_libp2p_networking.yml @@ -40,14 +40,16 @@ jobs: uses: actions-rs/clippy-check@v1 with: token: ${{ github.token }} + args: --manifest-path libp2p-networking/Cargo.toml - - name: Audit - uses: actions-rs/audit-check@v1 - with: - token: ${{ github.token }} + # Does not work with a nested dir + # - name: Audit + # uses: actions-rs/audit-check@v1 + # with: + # token: ${{ github.token }} - name: Cargo Build - run: cargo build --release + run: cargo build --release --manifest-path libp2p-networking/Cargo.toml - name: Cargo Test - run: cargo test --verbose --release test_stress -- -Zunstable-options --report-time --test-threads=1 + run: cargo test --verbose --release test_stress --manifest-path libp2p-networking/Cargo.toml -- -Zunstable-options --report-time --test-threads=1 diff --git a/.github/workflows/coverage_libp2p_networking.yml b/.github/workflows/coverage_libp2p_networking.yml index 20ecd6fbb3..77b7874389 100644 --- a/.github/workflows/coverage_libp2p_networking.yml +++ b/.github/workflows/coverage_libp2p_networking.yml @@ -34,19 +34,20 @@ jobs: RUSTFLAGS: '-Zprofile -Ccodegen-units=1 -Cinline-threshold=0 -Clink-dead-code -Coverflow-checks=off -Cpanic=abort -Zpanic_abort_tests' RUSTDOCFLAGS: '-Zprofile -Ccodegen-units=1 -Cinline-threshold=0 -Clink-dead-code -Coverflow-checks=off -Cpanic=abort -Zpanic_abort_tests' - - name: Install grcov - run: | - wget -O grcov.tar.gz https://github.com/mozilla/grcov/releases/download/v0.8.2/grcov-linux-x86_64.tar.bz2 - tar -xvf grcov.tar.gz - sudo mv -v grcov /home/runner/.cargo/bin/ - rm -rv grcov.tar.gz + # TODO: Seems like we can't override the path where grcov runs, so we're currently code coveraging the main repo + # - name: Install grcov + # run: | + # wget -O grcov.tar.gz https://github.com/mozilla/grcov/releases/download/v0.8.2/grcov-linux-x86_64.tar.bz2 + # tar -xvf grcov.tar.gz + # sudo mv -v grcov /home/runner/.cargo/bin/ + # rm -rv grcov.tar.gz - - name: Run Coverage Tool (grcov) - uses: actions-rs/grcov@v0.1 - id: coverage + # - name: Run Coverage Tool (grcov) + # uses: actions-rs/grcov@v0.1 + # id: coverage - - name: Coveralls upload - uses: coverallsapp/github-action@master - with: - github-token: ${{ secrets.GITHUB_TOKEN }} - path-to-lcov: ${{ steps.coverage.outputs.report }} + # - name: Coveralls upload + # uses: coverallsapp/github-action@master + # with: + # github-token: ${{ secrets.GITHUB_TOKEN }} + # path-to-lcov: ${{ steps.coverage.outputs.report }}