Git-Mirrors/xmr-btc-swap
1
0
Fork 0
mirror of https://github.com/comit-network/xmr-btc-swap.git synced 2025-09-18 20:04:38 -04:00
Code Issues Projects Releases Packages Wiki Activity

Update rust-toolchain to new toml syntax

Browse source 
This allows us to completely skip the "Install Rust" step in CI
because the rust-toolchain file completely describes what we need.
The first invocation of cargo will simply install all the required
components.

Additionally, we make all caches dependant on the version of Rust
that we require.
This commit is contained in:
Thomas Eizinger 2021-02-17 14:55:53 +11:00
parent 8072f4d7ee
commit fb45ff66eb
No known key found for this signature in database
GPG key ID: 651AC83A6C6C8B96
2 changed files with 7 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

33
.github/workflows/ci.yml vendored
View file

@ -15,19 +15,12 @@ jobs:
- name: Checkout sources
uses: actions/checkout@v2
- name: Install Rust
uses: actions-rs/toolchain@v1
with:
profile: minimal
override: true
components: rustfmt, clippy
- name: Cache ~/.cargo/bin directory
id: cargo-bin-cache
uses: actions/cache@v2.1.4
with:
path: ~/.cargo/bin
key: ubuntu-rust-${{ env.RUST_TOOLCHAIN }}-cargo-bin-directory-v1
key: ubuntu-rust-${{ hashFiles('rust-toolchain') }}-cargo-bin-directory-v1
- name: Install tomlfmt
if: steps.cargo-bin-cache.outputs.cache-hit != 'true'
@ -63,19 +56,13 @@ jobs:
- name: Checkout sources
uses: actions/checkout@v2
- name: Install Rust toolchain
uses: actions-rs/toolchain@v1
with:
profile: minimal
override: true
- name: Cache target and registry directory
uses: actions/cache@v2.1.4
with:
path: |
target
~/.cargo/registry
key: rust-${{ matrix.target }}-build-${{ hashFiles('Cargo.lock') }}-v1
key: rust-${{ matrix.target }}-build-${{ hashFiles('Cargo.lock') }}-${{ hashFiles('rust-toolchain') }}-v1
- name: Build binary
run: |
@ -110,19 +97,13 @@ jobs:
- name: Checkout sources
uses: actions/checkout@v2
- name: Install Rust toolchain
uses: actions-rs/toolchain@v1
with:
profile: minimal
override: true
- name: Cache target and registry directory
uses: actions/cache@v2.1.4
with:
path: |
target
~/.cargo/registry
key: rust-${{ matrix.target }}-test-${{ hashFiles('Cargo.lock') }}-v1
key: rust-${{ matrix.target }}-test-${{ hashFiles('Cargo.lock') }}-${{ hashFiles('rust-toolchain') }}-v1
- name: Build tests
run: cargo build --tests --workspace --all-features
@ -152,19 +133,13 @@ jobs:
- name: Checkout sources
uses: actions/checkout@v2
- name: Install Rust toolchain
uses: actions-rs/toolchain@v1
with:
profile: minimal
override: true
- name: Cache target and registry directory
uses: actions/cache@v2.1.4
with:
path: |
target
~/.cargo/registry
key: rust-${{ matrix.target }}-test-${{ hashFiles('Cargo.lock') }}-v1
key: rust-${{ matrix.target }}-test-${{ hashFiles('Cargo.lock') }}-${{ hashFiles('rust-toolchain') }}-v1
- name: Run test ${{ matrix.test_name }}
run: cargo test --package swap --all-features --test ${{ matrix.test_name }} ""