Skip to content

Commit

Permalink
Merge #355
Browse files Browse the repository at this point in the history
355: Multi-core removal r=korken89 a=AfoHT

Dependent on rtic-rs/rtic-syntax#27

With the same reasoning as ^^

For now the testing is done against my rtic-syntax/multiremove-branch, but before we merge it should corrected.

Co-authored-by: Henrik Tjäder <henrik@tjaders.com>
  • Loading branch information
bors[bot] and AfoHT committed Sep 4, 2020
2 parents c5e6d1f + ad2b809 commit 7506bd8
Show file tree
Hide file tree
Showing 48 changed files with 440 additions and 1,654 deletions.
61 changes: 0 additions & 61 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -156,13 +156,6 @@ jobs:
command: check
args: --examples --target=${{ matrix.target }} --features __min_r1_43

- name: cargo check -p homogeneous
uses: actions-rs/cargo@v1
with:
use-cross: false
command: check
args: -p homogeneous --examples --target=${{ matrix.target }}

# Use precompiled binutils
- name: cargo install cargo-binutils
uses: actions-rs/install@v0.1
Expand Down Expand Up @@ -481,57 +474,6 @@ jobs:
command: test
args: --test single

# Verify all multicore examples
checkmulticore:
name: checkmulticore
runs-on: ubuntu-20.04
strategy:
matrix:
target:
- x86_64-unknown-linux-gnu
toolchain:
- nightly
steps:
- name: Checkout
uses: actions/checkout@v2

- name: Install Rust ${{ matrix.toolchain }} with x86_64-unknown-linux-gnu
uses: actions-rs/toolchain@v1
with:
toolchain: ${{ matrix.toolchain }}
target: x86_64-unknown-linux-gnu
override: true
- name: Install Rust ${{ matrix.toolchain }} with thumbv7m-none-eabi
uses: actions-rs/toolchain@v1
with:
toolchain: ${{ matrix.toolchain }}
target: thumbv7m-none-eabi
override: true
- name: Install Rust ${{ matrix.toolchain }} with thumbv6m-none-eabi
uses: actions-rs/toolchain@v1
with:
toolchain: ${{ matrix.toolchain }}
target: thumbv6m-none-eabi
override: true
- uses: actions-rs/cargo@v1
with:
command: install
args: microamp-tools --version 0.1.0-alpha.3

- name: Check multi-core examples
run: |
cd heterogeneous
exs=(
smallest
x-init-2
x-init
x-schedule
x-spawn
)
for ex in ${exs[@]}; do
cargo-microamp --example=$ex --target thumbv7m-none-eabi,thumbv6m-none-eabi --check
done
# Build documentation, check links
docs:
name: docs
Expand Down Expand Up @@ -661,7 +603,6 @@ jobs:
- checkmacros
- testv7
- testv6
- checkmulticore
- docs
- mdbook
# Only run this when pushing to master branch
Expand Down Expand Up @@ -765,7 +706,6 @@ jobs:
- checkmacros
- testv7
- testv6
- checkmulticore
- docs
- mdbook
runs-on: ubuntu-20.04
Expand All @@ -782,7 +722,6 @@ jobs:
- checkmacros
- testv7
- testv6
- checkmulticore
- docs
- mdbook
runs-on: ubuntu-20.04
Expand Down
4 changes: 0 additions & 4 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -77,8 +77,6 @@ version = "0.5.2"
trybuild = "1"

[features]
heterogeneous = ["cortex-m-rtic-macros/heterogeneous", "microamp"]
homogeneous = ["cortex-m-rtic-macros/homogeneous"]
# used for testing this crate; do not use in applications
__v7 =[]
__min_r1_43 =[]
Expand All @@ -89,8 +87,6 @@ lto = true

[workspace]
members = [
"heterogeneous",
"homogeneous",
"macros",
]

Expand Down
18 changes: 0 additions & 18 deletions heterogeneous/Cargo.toml

This file was deleted.

1 change: 0 additions & 1 deletion heterogeneous/README.md

This file was deleted.

7 changes: 0 additions & 7 deletions heterogeneous/examples/smallest.rs

This file was deleted.

39 changes: 0 additions & 39 deletions heterogeneous/examples/x-init-2.rs

This file was deleted.

26 changes: 0 additions & 26 deletions heterogeneous/examples/x-init.rs

This file was deleted.

36 changes: 0 additions & 36 deletions heterogeneous/examples/x-schedule.rs

This file was deleted.

20 changes: 0 additions & 20 deletions heterogeneous/examples/x-spawn.rs

This file was deleted.

99 changes: 0 additions & 99 deletions heterogeneous/src/lib.rs

This file was deleted.

17 changes: 0 additions & 17 deletions homogeneous/Cargo.toml

This file was deleted.

1 change: 0 additions & 1 deletion homogeneous/README.md

This file was deleted.

7 changes: 0 additions & 7 deletions homogeneous/examples/smallest.rs

This file was deleted.

0 comments on commit 7506bd8

Please sign in to comment.