diff options
| -rw-r--r-- | cortex-m-rt/.github/bors.toml | 14 | ||||
| -rw-r--r-- | cortex-m-rt/.github/workflows/ci.yml | 21 |
2 files changed, 16 insertions, 19 deletions
diff --git a/cortex-m-rt/.github/bors.toml b/cortex-m-rt/.github/bors.toml index 1972ab0..b4017af 100644 --- a/cortex-m-rt/.github/bors.toml +++ b/cortex-m-rt/.github/bors.toml @@ -2,17 +2,7 @@ block_labels = ["needs-decision"] delete_merged_branches = true required_approvals = 1 status = [ - "ci-linux (stable, x86_64-unknown-linux-gnu)", - "ci-linux (stable, thumbv6m-none-eabi)", - "ci-linux (stable, thumbv7m-none-eabi)", - "ci-linux (stable, thumbv7em-none-eabi)", - "ci-linux (stable, thumbv7em-none-eabihf)", - "ci-linux (stable, thumbv8m.main-none-eabi)", - "ci-linux (1.39.0, x86_64-unknown-linux-gnu)", - "ci-linux (1.39.0, thumbv6m-none-eabi)", - "ci-linux (1.39.0, thumbv7m-none-eabi)", - "ci-linux (1.39.0, thumbv7em-none-eabi)", - "ci-linux (1.39.0, thumbv7em-none-eabihf)", - "ci-linux (1.39.0, thumbv8m.main-none-eabi)", + "ci-linux (stable)", + "ci-linux (1.39.0)", "Rustfmt" ] diff --git a/cortex-m-rt/.github/workflows/ci.yml b/cortex-m-rt/.github/workflows/ci.yml index 4e4cda7..84e05f2 100644 --- a/cortex-m-rt/.github/workflows/ci.yml +++ b/cortex-m-rt/.github/workflows/ci.yml @@ -13,9 +13,6 @@ jobs: # All generated code should be running on stable now rust: [nightly, stable, 1.39.0] - # The default target we're compiling on and for - TARGET: [x86_64-unknown-linux-gnu, thumbv6m-none-eabi, thumbv7m-none-eabi, thumbv7em-none-eabi, thumbv7em-none-eabihf, thumbv8m.main-none-eabi] - include: # Nightly is only for reference and allowed to fail - rust: nightly @@ -27,10 +24,20 @@ jobs: with: profile: minimal toolchain: ${{ matrix.rust }} - target: ${{ matrix.TARGET }} override: true - components: rustfmt + - name: Install all Rust targets for ${{ matrix.rust }} + run: rustup target install --toolchain=${{ matrix.rust }} thumbv6m-none-eabi thumbv7m-none-eabi thumbv7em-none-eabi thumbv7em-none-eabihf thumbv8m.main-none-eabi - name: Install qemu and gcc run: sudo apt-get update && sudo apt-get install qemu-system-arm gcc-arm-none-eabi - - name: Run CI script for ${{ matrix.TARGET }} under ${{ matrix.rust }} - run: TARGET=${{ matrix.TARGET }} TRAVIS_RUST_VERSION=${{ matrix.rust }} bash ci/script.sh + - name: Run CI script for x86_64-unknown-linux-gnu under ${{ matrix.rust }} + run: TARGET=x86_64-unknown-linux-gnu TRAVIS_RUST_VERSION=${{ matrix.rust }} bash ci/script.sh + - name: Run CI script for thumbv6m-none-eabi under ${{ matrix.rust }} + run: TARGET=thumbv6m-none-eabi TRAVIS_RUST_VERSION=${{ matrix.rust }} bash ci/script.sh + - name: Run CI script for thumbv7m-none-eabi under ${{ matrix.rust }} + run: TARGET=thumbv7m-none-eabi TRAVIS_RUST_VERSION=${{ matrix.rust }} bash ci/script.sh + - name: Run CI script for thumbv7em-none-eabi under ${{ matrix.rust }} + run: TARGET=thumbv7em-none-eabi TRAVIS_RUST_VERSION=${{ matrix.rust }} bash ci/script.sh + - name: Run CI script for thumbv7em-none-eabihf under ${{ matrix.rust }} + run: TARGET=thumbv7em-none-eabihf TRAVIS_RUST_VERSION=${{ matrix.rust }} bash ci/script.sh + - name: Run CI script for thumbv8m.main-none-eabi under ${{ matrix.rust }} + run: TARGET=thumbv8m.main-none-eabi TRAVIS_RUST_VERSION=${{ matrix.rust }} bash ci/script.sh |