[ci] Remove actions-rs, cleanup names

diff --git a/.github/workflows/code_coverage.yml b/.github/workflows/code_coverage.yml
index 383c49a0671df927741af1ca9b879e96660e6063..fa51cc72b411f3c2f78f930bdb585a58d43147c1 100644 (file)
--- a/.github/workflows/code_coverage.yml
+++ b/.github/workflows/code_coverage.yml
@@ -7,22 +7,20 @@ jobs:
     name: Tarpaulin to codecov.io
     runs-on: ubuntu-latest
     steps:
-      - name: checkout
+      - name: Checkout
         uses: actions/checkout@v2
 
-      - name: toolchain
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: nightly
-          override: true
+      - name: Set default toolchain
+        run: rustup default nightly
+      - name: Set profile
+        run: rustup set profile minimal
 
-      - name: tarpaulin
-        uses: actions-rs/tarpaulin@v0.1.2
-        with:
-          version: '0.15.0'
-          args: --features all-keys,cli-utils,compiler,esplora,compact_filters --run-types Tests,Doctests --exclude-files "testutils/*"
+      - name: Install tarpaulin
+        run: cargo install cargo-tarpaulin
+      - name: Tarpaulin
+        run: cargo tarpaulin --features all-keys,cli-utils,compiler,esplora,compact_filters --run-types Tests,Doctests --exclude-files "testutils/*"
 
-      - name: codecov.io
+      - name: Publish to codecov.io
         uses: codecov/codecov-action@v1.0.14
         with:
           token: ${{secrets.CODECOV_TOKEN}}

diff --git a/.github/workflows/cont_integration.yml b/.github/workflows/cont_integration.yml
index 5a588c157d2ae7a8929509d3c72a6a77385fb728..fa4430b5d1b990af6031570422fae826039c39b4 100644 (file)
--- a/.github/workflows/cont_integration.yml
+++ b/.github/workflows/cont_integration.yml
@@ -1,11 +1,11 @@
 on: [push, pull_request]
 
-name: Continuous integration
+name: CI
 
 jobs:
 
   build-test:
-    name: Build and Test
+    name: Build and test
     runs-on: ubuntu-latest
     strategy:
       matrix:
@@ -40,33 +40,23 @@ jobs:
             ~/.cargo/git
             target
           key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.toml','**/Cargo.lock') }}
-      - name: toolchain
-        uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: ${{ matrix.rust }}
-          override: true
-          components: clippy
-      - name: build
-        uses: actions-rs/cargo@v1
-        with:
-          command: build
-          args: --features ${{ matrix.features }} --no-default-features
-      - name: clippy
+      - name: Set default toolchain
+        run: rustup default ${{ matrix.rust }}
+      - name: Set profile
+        run: rustup set profile minimal
+      - name: Add clippy
+        run: rustup component add clippy
+      - name: Build
+        run: cargo build --features ${{ matrix.features }} --no-default-features
+      - name: Clippy
         if: ${{ matrix.rust == 'stable' && matrix.clippy != 'skip' }}
-        uses: actions-rs/cargo@v1
-        with:
-          command: clippy
-          args: -- -D warnings
-      - name: test
+        run: cargo clippy -- -D warnings
+      - name: Test
         if: ${{ matrix.test != 'skip' }}
-        uses: actions-rs/cargo@v1
-        with:
-          command: test
-          args: --features ${{ matrix.features }} --no-default-features
+        run: cargo test --features ${{ matrix.features }} --no-default-features
 
   test-electrum:
-    name: Test Electrum
+    name: Test electrum
     runs-on: ubuntu-16.04
     container: bitcoindevkit/electrs
     env:
@@ -76,9 +66,9 @@ jobs:
       MAGICAL_RPC_URL: 127.0.0.1:18443
       MAGICAL_ELECTRUM_URL: tcp://127.0.0.1:60401
     steps:
-      - name: checkout
+      - name: Checkout
         uses: actions/checkout@v2
-      - name: cache
+      - name: Cache
         uses: actions/cache@v2
         with:
           path: |
@@ -86,19 +76,16 @@ jobs:
             ~/.cargo/git
             target
           key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.toml','**/Cargo.lock') }}
-      - name: toolchain
-        uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: stable
-          override: true
-      - name: start core
+      - name: Install rustup
+        run: curl https://sh.rustup.rs -sSf | sh -s -- -y
+      - name: Set default toolchain
+        run: $HOME/.cargo/bin/rustup default stable
+      - name: Set profile
+        run: $HOME/.cargo/bin/rustup set profile minimal
+      - name: Start core
         run: ./ci/start-core.sh
-      - name: test
-        uses: actions-rs/cargo@v1
-        with:
-          command: test
-          args: --features test-electrum --no-default-features
+      - name: Test
+        run: $HOME/.cargo/bin/cargo test --features test-electrum --no-default-features
 
   check-wasm:
     name: Check WASM
@@ -107,9 +94,9 @@ jobs:
       CC: clang-10
       CFLAGS: -I/usr/include
     steps:
-      - name: checkout
+      - name: Checkout
         uses: actions/checkout@v2
-      - name: cache
+      - name: Cache
         uses: actions/cache@v2
         with:
           path: |
@@ -122,34 +109,26 @@ jobs:
       - run: sudo apt-add-repository "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-10 main" || exit 1
       - run: sudo apt-get update || exit 1
       - run: sudo apt-get install -y clang-10 libc6-dev-i386 || exit 1
-      - name: toolchain
-        uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: stable
-          target: wasm32-unknown-unknown
-          override: true
-      - name: check
-        uses: actions-rs/cargo@v1
-        with:
-          command: check
-          args: --target wasm32-unknown-unknown --features cli-utils,esplora --no-default-features
+      - name: Set default toolchain
+        run: rustup default stable
+      - name: Set profile
+        run: rustup set profile minimal
+      - name: Add target wasm32
+        run: rustup target add wasm32-unknown-unknown
+      - name: Check
+        run: cargo check --target wasm32-unknown-unknown --features cli-utils,esplora --no-default-features
 
   fmt:
     name: Rust fmt
     runs-on: ubuntu-latest
     steps:
-      - name: checkout
+      - name: Checkout
         uses: actions/checkout@v2
-      - name: toolchain
-        uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: stable
-          override: true
-          components: rustfmt
-      - name: fmt check
-        uses: actions-rs/cargo@v1
-        with:
-          command: fmt
-          args: --all -- --check
\ No newline at end of file
+      - name: Set default toolchain
+        run: rustup default stable
+      - name: Set profile
+        run: rustup set profile minimal
+      - name: Add clippy
+        run: rustup component add rustfmt
+      - name: Check fmt
+        run: cargo fmt --all -- --check
\ No newline at end of file

diff --git a/README.md b/README.md
index 09c47b4f7ec0212cc95b536aec38e821a954369e..4f2394e28192d1a60551219a0a142ec87a24032a 100644 (file)
--- a/README.md
+++ b/README.md
@@ -9,7 +9,7 @@
 
   <p>
     <!-- <a href="https://crates.io/crates/magical"><img alt="Crate Info" src="https://img.shields.io/crates/v/magical.svg"/></a> -->
-    <a href="https://github.com/bitcoindevkit/bdk/actions?query=workflow%3A%22Continuous+integration%22"><img alt="Continuous integration Status" src="https://github.com/bitcoindevkit/bdk/workflows/Continuous%20integration/badge.svg"></a>
+    <a href="https://github.com/bitcoindevkit/bdk/actions?query=workflow%3ACI"><img alt="CI Status" src="https://github.com/bitcoindevkit/bdk/workflows/CI/badge.svg"></a>
     <a href="https://codecov.io/gh/bitcoindevkit/bdk"><img src="https://codecov.io/gh/bitcoindevkit/bdk/branch/master/graph/badge.svg"/></a>
     <a href="https://bitcoindevkit.org/docs-rs/bdk"><img alt="API Docs" src="https://img.shields.io/badge/docs.rs-bdk-green"/></a>
     <a href="https://blog.rust-lang.org/2020/07/16/Rust-1.45.0.html"><img alt="Rustc Version 1.45+" src="https://img.shields.io/badge/rustc-1.45%2B-lightgrey.svg"/></a>