Merge branch 'main' into qtpy-rp2040

JohnAZoidberg · JohnAZoidberg · commit b0d50fc8ae4e · 2023-10-08T18:05:29.000+08:00
diff --git a/.github/workflows/firmware.yml b/.github/workflows/firmware.yml
@@ -1,4 +1,4 @@
-name: Firmware Checks
+name: Firmware
 
 on:
   push:
@@ -68,28 +68,31 @@ jobs:
       - name: Upload ledmatrix files
         uses: actions/upload-artifact@v3
         with:
-          name: inputmodule_fw_bin
+          name: ledmatrix_fw_${{github.sha}}
           path: |
-            ledmatrix.bin
-            ledmatrix.uf2
-            ledmatrix_10k.uf2
-            ledmatrix_evt.uf2
+            # Main firmware
+            target/thumbv6m-none-eabi/release/ledmatrix.bin
+            target/thumbv6m-none-eabi/release/ledmatrix.uf2
+            # EVT 10k resistor
+            target/thumbv6m-none-eabi/release/ledmatrix_10k.uf2
+            # EVT (27k) resistor
+            target/thumbv6m-none-eabi/release/ledmatrix_evt.uf2
 
       - name: Upload b1display files
         uses: actions/upload-artifact@v3
         with:
-          name: inputmodule_fw_uf2
+          name: b1display_fw_${{github.sha}}
           path: |
-            b1display.bin
-            b1display.uf2
+            target/thumbv6m-none-eabi/release/b1display.bin
+            target/thumbv6m-none-eabi/release/b1display.uf2
 
       - name: Upload c1minimal files
         uses: actions/upload-artifact@v3
         with:
-          name: inputmodule_fw_uf2
+          name: c1minimal_fw_${{github.sha}}
           path: |
-            c1minimal.bin
-            c1minimal.uf2
+            target/thumbv6m-none-eabi/release/c1minimal.bin
+            target/thumbv6m-none-eabi/release/c1minimal.uf2
 
   linting:
     name: Linting
diff --git a/.github/workflows/software.yml b/.github/workflows/software.yml
@@ -1,4 +1,4 @@
-name: Software Checks
+name: Software
 
 on:
   push:
diff --git a/.github/workflows/traditional-cargo.yml b/.github/workflows/traditional-cargo.yml
@@ -1,6 +1,6 @@
 # Test builds without cargo-make
 # Not the recommended path, but should make sure it still works
-name: Traditional Cargo Workflow
+name: Traditional Cargo
 
 on:
   push:
@@ -75,7 +75,7 @@ jobs:
       run: cargo run --release --target x86_64-pc-windows-msvc -p inputmodule-control -- --help | grep 'RAW HID and VIA commandline'
 
   lint-format:
-    name: Lint and format check
+    name: Lint and format
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-name: Software Checks`
	`1`	`+name: Software`
`2`	`2`
`3`	`3`	`on:`
`4`	`4`	`push:`