Skip to content

Commit b93d02d

Browse files
Merge pull request #174 from rust-embedded/use-tier2-thumbv7
Thumb-mode v7-A, v7-R and v8-R now at Tier 2 in nightly.
2 parents 988f9c2 + 6012872 commit b93d02d

6 files changed

Lines changed: 31 additions & 23 deletions

File tree

.github/workflows/build.yml

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,14 @@ jobs:
4444
run: |
4545
just build-tier2 ${{ matrix.target }}
4646
47-
# These targets need build-std
48-
build-tier3:
47+
build-tier2-nightly:
4948
runs-on: ubuntu-24.04
5049
needs: setup
5150
strategy:
5251
matrix:
5352
target:
53+
# These targets made Tier 2 on 2026-06-04
54+
# They'll move to build-tier2 once they reach stable
5455
- thumbv7r-none-eabi
5556
- thumbv7r-none-eabihf
5657
- thumbv7a-none-eabi
@@ -63,12 +64,12 @@ jobs:
6364
uses: taiki-e/install-action@just
6465
- name: Install Rust
6566
run: |
66-
rustup install stable
67-
rustup default stable
68-
rustup component add rust-src
67+
rustup install nightly-2026-06-04
68+
rustup default nightly-2026-06-04
69+
rustup target add ${{ matrix.target }}
6970
- name: Build
7071
run: |
71-
just build-tier3 ${{ matrix.target }}
72+
just build-tier2 ${{ matrix.target }}
7273
7374
# These targets need build-std, and have no atomics so we have to skip
7475
# the 'critical-section-multi-core' feature
@@ -119,7 +120,7 @@ jobs:
119120
# Gather all the above build jobs together for the purposes of getting an overall pass-fail
120121
build-all:
121122
runs-on: ubuntu-24.04
122-
needs: [build-tier2, build-tier3-no-atomics, build-tier3, build-arm-targets]
123+
needs: [build-tier2, build-tier3-no-atomics, build-tier2-nightly, build-arm-targets]
123124
steps:
124125
- run: /bin/true
125126

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
[toolchain]
2-
channel = "stable"
2+
channel = "nightly-2026-06-04"
33
targets = [
44
"armv8r-none-eabihf",
5+
"thumbv8r-none-eabihf",
56
]
67
components = ["rust-src", "clippy", "rustfmt"]
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
[toolchain]
2-
channel = "stable"
2+
channel = "nightly-2026-06-04"
33
targets = [
44
"armv8r-none-eabihf",
5+
"thumbv8r-none-eabihf",
56
]
67
components = ["rust-src", "clippy", "rustfmt"]
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
[toolchain]
2-
channel = "stable"
2+
channel = "nightly-2026-06-04"
33
targets = [
44
"armv8r-none-eabihf",
5+
"thumbv8r-none-eabihf",
56
]
67
components = ["rust-src", "clippy", "rustfmt"]
Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
[toolchain]
2-
channel = "stable"
2+
channel = "nightly-2026-06-04"
33
targets = [
44
"armv7r-none-eabi",
55
"armv7r-none-eabihf",
66
"armv7a-none-eabi",
77
"armv7a-none-eabihf",
8+
"thumbv7r-none-eabi",
9+
"thumbv7r-none-eabihf",
10+
"thumbv7a-none-eabi",
11+
"thumbv7a-none-eabihf",
812
]
913
components = ["rust-src", "clippy", "rustfmt"]

justfile

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,15 @@ build-all: \
4040
(build-tier3-no-atomics "thumbv6-none-eabi") \
4141
(build-tier3-no-atomics "armv6-none-eabihf") \
4242
(build-tier2 "armv7r-none-eabi") \
43-
(build-tier3 "thumbv7r-none-eabi") \
43+
(build-tier2 "thumbv7r-none-eabi") \
4444
(build-tier2 "armv7r-none-eabihf") \
45-
(build-tier3 "thumbv7r-none-eabihf") \
45+
(build-tier2 "thumbv7r-none-eabihf") \
4646
(build-tier2 "armv7a-none-eabi") \
47-
(build-tier3 "thumbv7a-none-eabi") \
47+
(build-tier2 "thumbv7a-none-eabi") \
4848
(build-tier2 "armv7a-none-eabihf") \
49-
(build-tier3 "thumbv7a-none-eabihf") \
49+
(build-tier2 "thumbv7a-none-eabihf") \
5050
(build-tier2 "armv8r-none-eabihf") \
51-
(build-tier3 "thumbv8r-none-eabihf") \
51+
(build-tier2 "thumbv8r-none-eabihf") \
5252

5353
# Build the arm-targets library
5454
build-arm-targets:
@@ -79,17 +79,17 @@ build-all-examples: \
7979
(build-versatileab-tier3 "thumbv5te-none-eabi") \
8080
(build-versatileab-tier3 "armv6-none-eabi") \
8181
(build-versatileab-tier3 "armv6-none-eabihf") \
82+
(build-versatileab-tier3 "thumbv6-none-eabi") \
8283
(build-versatileab-tier2 "armv7r-none-eabi") \
83-
(build-versatileab-tier3 "thumbv7r-none-eabi") \
84+
(build-versatileab-tier2 "thumbv7r-none-eabi") \
8485
(build-versatileab-tier2 "armv7r-none-eabihf") \
85-
(build-versatileab-tier3 "thumbv7r-none-eabihf") \
86+
(build-versatileab-tier2 "thumbv7r-none-eabihf") \
8687
(build-versatileab-tier2 "armv7a-none-eabi") \
87-
(build-versatileab-tier3 "thumbv7a-none-eabi") \
88+
(build-versatileab-tier2 "thumbv7a-none-eabi") \
8889
(build-versatileab-tier2 "armv7a-none-eabihf") \
89-
(build-versatileab-tier3 "thumbv7a-none-eabihf") \
90-
(build-mps3-tier2 "armv8r-none-eabihf") \
91-
(build-mps3-tier3 "thumbv8r-none-eabihf") \
92-
# (build-versatileab-tier3 "thumbv6-none-eabi") \
90+
(build-versatileab-tier2 "thumbv7a-none-eabihf") \
91+
(build-mps3-tier2 "armv8r-none-eabihf") \
92+
(build-mps3-tier2 "thumbv8r-none-eabihf") \
9393

9494
# Builds the Versatile AB examples, building core from source
9595
build-versatileab-tier3 target:

0 commit comments

Comments
 (0)