diff options
| -rw-r--r-- | .github/workflows/rust.yml | 21 | ||||
| -rwxr-xr-x | test-build.sh | 20 |
2 files changed, 20 insertions, 21 deletions
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index b2505e80d..a0eefd3a9 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml | |||
| @@ -2,24 +2,23 @@ name: Rust | |||
| 2 | 2 | ||
| 3 | on: | 3 | on: |
| 4 | push: | 4 | push: |
| 5 | branches: [ master ] | 5 | branches: [master] |
| 6 | pull_request: | 6 | pull_request: |
| 7 | branches: [ master ] | 7 | branches: [master] |
| 8 | 8 | ||
| 9 | env: | 9 | env: |
| 10 | CARGO_TERM_COLOR: always | 10 | CARGO_TERM_COLOR: always |
| 11 | 11 | ||
| 12 | jobs: | 12 | jobs: |
| 13 | build: | 13 | build: |
| 14 | |||
| 15 | runs-on: ubuntu-latest | 14 | runs-on: ubuntu-latest |
| 16 | 15 | ||
| 17 | steps: | 16 | steps: |
| 18 | - uses: actions/checkout@v2 | 17 | - uses: actions/checkout@v2 |
| 19 | - uses: actions-rs/toolchain@v1 | 18 | - uses: actions-rs/toolchain@v1 |
| 20 | with: | 19 | with: |
| 21 | toolchain: nightly | 20 | toolchain: nightly |
| 22 | target: thumbv7em-none-eabihf | 21 | target: thumbv7em-none-eabi |
| 23 | override: true | 22 | override: true |
| 24 | - name: Build | 23 | - name: Build |
| 25 | run: ./test-build.sh | 24 | run: ./test-build.sh |
diff --git a/test-build.sh b/test-build.sh index a3b5e8dfc..ae603b289 100755 --- a/test-build.sh +++ b/test-build.sh | |||
| @@ -3,20 +3,20 @@ | |||
| 3 | set -euxo pipefail | 3 | set -euxo pipefail |
| 4 | 4 | ||
| 5 | # examples | 5 | # examples |
| 6 | (cd examples; cargo build --target thumbv7em-none-eabihf --bins) | 6 | (cd examples; cargo build --target thumbv7em-none-eabi --bins) |
| 7 | 7 | ||
| 8 | # embassy | 8 | # embassy |
| 9 | (cd embassy; cargo build --target thumbv7em-none-eabihf) | 9 | (cd embassy; cargo build --target thumbv7em-none-eabi) |
| 10 | (cd embassy; cargo build --target thumbv7em-none-eabihf --features log) | 10 | (cd embassy; cargo build --target thumbv7em-none-eabi --features log) |
| 11 | (cd embassy; cargo build --target thumbv7em-none-eabihf --features defmt) | 11 | (cd embassy; cargo build --target thumbv7em-none-eabi --features defmt) |
| 12 | 12 | ||
| 13 | # embassy-nrf | 13 | # embassy-nrf |
| 14 | (cd embassy-nrf; cargo build --target thumbv7em-none-eabi --features 52810) | 14 | (cd embassy-nrf; cargo build --target thumbv7em-none-eabi --features 52810) |
| 15 | #(cd embassy-nrf; cargo build --target thumbv7em-none-eabihf --features 52811) # nrf52811-hal doesn't exist yet | 15 | #(cd embassy-nrf; cargo build --target thumbv7em-none-eabi --features 52811) # nrf52811-hal doesn't exist yet |
| 16 | (cd embassy-nrf; cargo build --target thumbv7em-none-eabihf --features 52832) | 16 | (cd embassy-nrf; cargo build --target thumbv7em-none-eabi --features 52832) |
| 17 | (cd embassy-nrf; cargo build --target thumbv7em-none-eabihf --features 52833) | 17 | (cd embassy-nrf; cargo build --target thumbv7em-none-eabi --features 52833) |
| 18 | (cd embassy-nrf; cargo build --target thumbv7em-none-eabihf --features 52840) | 18 | (cd embassy-nrf; cargo build --target thumbv7em-none-eabi --features 52840) |
| 19 | 19 | ||
| 20 | (cd embassy-nrf; cargo build --target thumbv7em-none-eabihf --features 52840,log) | 20 | (cd embassy-nrf; cargo build --target thumbv7em-none-eabi --features 52840,log) |
| 21 | (cd embassy-nrf; cargo build --target thumbv7em-none-eabihf --features 52840,defmt) | 21 | (cd embassy-nrf; cargo build --target thumbv7em-none-eabi --features 52840,defmt) |
| 22 | 22 | ||
