Skip to content

Commit 73def59

Browse files
committed
Update GHA for integrated cortex-m-rt
1 parent 0ffd083 commit 73def59

File tree

13 files changed

+20
-63
lines changed

13 files changed

+20
-63
lines changed

.github/bors.toml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,10 @@ required_approvals = 1
44
status = [
55
"ci-linux (stable)",
66
"ci-linux (1.40.0)",
7+
"rt-ci-linux (stable)",
8+
"rt-ci-linux (1.39.0)",
9+
"rt-ci-other-os (macOS-latest)",
10+
"rt-ci-other-os (windows-latest)",
711
"rustfmt",
812
"clippy",
913
]

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ on:
33
branches: [ staging, trying, master ]
44
pull_request:
55

6-
name: CI
6+
name: cortex-m CI
77

88
jobs:
99
ci-linux:

.github/workflows/clippy.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,4 @@ jobs:
2323
- uses: actions-rs/clippy-check@v1
2424
with:
2525
token: ${{ secrets.GITHUB_TOKEN }}
26+
args: --all

cortex-m-rt/.github/workflows/ci.yml renamed to .github/workflows/rt-ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ on:
33
branches: [ staging, trying, master ]
44
pull_request:
55

6-
name: Continuous integration
6+
name: cortex-m-rt CI
77

88
jobs:
9-
ci-linux:
9+
rt-ci-linux:
1010
runs-on: ubuntu-20.04
1111
continue-on-error: ${{ matrix.experimental || false }}
1212
strategy:
@@ -48,7 +48,7 @@ jobs:
4848
run: TARGET=thumbv8m.main-none-eabihf TRAVIS_RUST_VERSION=${{ matrix.rust }} bash ci/script.sh
4949

5050
# On macOS and Windows, we at least make sure that all examples build and link.
51-
build-other:
51+
rt-ci-other-os:
5252
strategy:
5353
matrix:
5454
os:

Cargo.toml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,13 @@ linker-plugin-lto = []
3434
std = []
3535

3636
[workspace]
37-
members = ["xtask", "cortex-m-semihosting", "panic-semihosting", "panic-itm"]
37+
members = [
38+
"xtask",
39+
"cortex-m-rt",
40+
"cortex-m-semihosting",
41+
"panic-semihosting",
42+
"panic-itm"
43+
]
3844

3945
[package.metadata.docs.rs]
4046
targets = [

cortex-m-rt/.github/CODEOWNERS

Lines changed: 0 additions & 1 deletion
This file was deleted.

cortex-m-rt/.github/bors.toml

Lines changed: 0 additions & 10 deletions
This file was deleted.

cortex-m-rt/.github/workflows/clippy.yml

Lines changed: 0 additions & 20 deletions
This file was deleted.

cortex-m-rt/.github/workflows/rustfmt.yml

Lines changed: 0 additions & 23 deletions
This file was deleted.

cortex-m-rt/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ keywords = ["arm", "cortex-m", "runtime", "startup"]
1111
license = "MIT OR Apache-2.0"
1212
name = "cortex-m-rt"
1313
readme = "README.md"
14-
repository = "https://github.com/rust-embedded/cortex-m-rt"
14+
repository = "https://github.com/rust-embedded/cortex-m"
1515
version = "0.7.1"
1616
autoexamples = true
1717
links = "cortex-m-rt" # Prevent multiple versions of cortex-m-rt being linked
@@ -22,7 +22,7 @@ cortex-m-rt-macros = { path = "macros", version = "=0.7.0" }
2222
# avoid pulling in multiple versions of `cortex-m`.
2323

2424
[dev-dependencies]
25-
cortex-m = "0.7.1"
25+
cortex-m = { version = "0.7.4", path = ".." }
2626
panic-halt = "0.2.0"
2727
cortex-m-semihosting = "0.3"
2828

0 commit comments

Comments
 (0)