diff options
| author | Dario Nieuwenhuis <dirbaio@dirbaio.net> | 2021-07-24 14:31:02 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-24 14:31:02 +0200 |
| commit | 1b2928a36dd7166f03fd7741571e0d61d4f8635e (patch) | |
| tree | c4d2b118eef382f8682ff61d3f7dc29d6be62df4 | |
| parent | 1e85ce1854212376d1e10090bd9675aa8070e416 (diff) | |
| parent | 5c0dbc8ea26eb982a42293bd795bc0252e5bb72a (diff) | |
| download | nrf-softdevice-1b2928a36dd7166f03fd7741571e0d61d4f8635e.zip | |
Merge pull request #75 from embassy-rs/update-nightly
Update rust nightly
| -rw-r--r-- | .github/workflows/rust.yml | 39 | ||||
| -rw-r--r-- | rust-toolchain.toml | 2 |
2 files changed, 16 insertions, 25 deletions
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 225b523..5c5f8e2 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -2,37 +2,28 @@ name: Rust on: push: - branches: [ master ] + branches: [master] pull_request: - branches: [ master ] + branches: [master] env: CARGO_TERM_COLOR: always jobs: build: - runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - uses: actions/cache@v2 - with: - path: | - ~/.cargo/registry - ~/.cargo/git - target - key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }} - - uses: actions-rs/toolchain@v1 - with: - toolchain: nightly - target: thumbv7em-none-eabihf - override: true - components: rustfmt - - - name: Build - run: ./ci.sh - - - name: Format - run: cargo fmt --verbose - + - uses: actions/checkout@v2 + - uses: actions/cache@v2 + with: + path: | + ~/.cargo/registry + ~/.cargo/git + target + key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }} + + - name: Check fmt + run: cargo fmt -- --check + - name: Build + run: ./ci.sh diff --git a/rust-toolchain.toml b/rust-toolchain.toml index de7fe6a..29db7f1 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,6 +1,6 @@ # Before upgrading check that everything is available on all tier1 targets here: # https://rust-lang.github.io/rustup-components-history [toolchain] -channel = "nightly-2021-05-07" +channel = "nightly-2021-07-13" components = [ "rust-src", "rustfmt" ] targets = [ "thumbv7em-none-eabihf" ] |