Merge pull request #37 from rursprung/only-build-defmt-on-rust-stable

only build `defmt` feature on stable rust + update dependencies
rust-embedded-community · May 22, 2024 · 5856dca · 5856dca
2 parents a340f5f + d254a71
commit 5856dca
Show file tree

Hide file tree

Showing 3 changed files with 61 additions and 46 deletions.
diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
@@ -15,6 +15,11 @@ jobs:
       matrix:
         rust: [1.62.0, stable]
         features: ['use_alloc', 'use_alloc,defmt', 'use_heapless', 'use_heapless,defmt']
+        exclude:
+          - rust: 1.62.0
+            features: 'use_alloc,defmt'
+          - rust: 1.62.0
+            features: 'use_heapless,defmt'
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4

diff --git a/examples/stm32f4-event-printer/.cargo/config → .../stm32f4-event-printer/.cargo/config.toml b/examples/stm32f4-event-printer/.cargo/config → .../stm32f4-event-printer/.cargo/config.toml
@@ -1,9 +1,12 @@
 [target.thumbv7em-none-eabihf]
 runner = 'probe-run --chip STM32F401RE'
+
+[target.'cfg(all(target_arch = "arm", target_os = "none"))']
+linker = "flip-link"
+
 rustflags = [
     "-C", "link-arg=-Tlink.x",
     "-C", "link-arg=-Tdefmt.x",
-    "-C", "linker=flip-link",
 ]
 
 [build]

diff --git a/examples/stm32f4-event-printer/Cargo.lock b/examples/stm32f4-event-printer/Cargo.lock