Skip to content

Commit 7e61d58

Browse files
Merge pull request #78 from FrameworkComputer/fix-upload
2 parents bb95ba7 + 9b5d870 commit 7e61d58

File tree

3 files changed

+18
-15
lines changed

3 files changed

+18
-15
lines changed

.github/workflows/firmware.yml

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Firmware Checks
1+
name: Firmware
22

33
on:
44
push:
@@ -61,28 +61,31 @@ jobs:
6161
- name: Upload ledmatrix files
6262
uses: actions/upload-artifact@v3
6363
with:
64-
name: inputmodule_fw_bin
64+
name: ledmatrix_fw_${{github.sha}}
6565
path: |
66-
ledmatrix.bin
67-
ledmatrix.uf2
68-
ledmatrix_10k.uf2
69-
ledmatrix_evt.uf2
66+
# Main firmware
67+
target/thumbv6m-none-eabi/release/ledmatrix.bin
68+
target/thumbv6m-none-eabi/release/ledmatrix.uf2
69+
# EVT 10k resistor
70+
target/thumbv6m-none-eabi/release/ledmatrix_10k.uf2
71+
# EVT (27k) resistor
72+
target/thumbv6m-none-eabi/release/ledmatrix_evt.uf2
7073
7174
- name: Upload b1display files
7275
uses: actions/upload-artifact@v3
7376
with:
74-
name: inputmodule_fw_uf2
77+
name: b1display_fw_${{github.sha}}
7578
path: |
76-
b1display.bin
77-
b1display.uf2
79+
target/thumbv6m-none-eabi/release/b1display.bin
80+
target/thumbv6m-none-eabi/release/b1display.uf2
7881
7982
- name: Upload c1minimal files
8083
uses: actions/upload-artifact@v3
8184
with:
82-
name: inputmodule_fw_uf2
85+
name: c1minimal_fw_${{github.sha}}
8386
path: |
84-
c1minimal.bin
85-
c1minimal.uf2
87+
target/thumbv6m-none-eabi/release/c1minimal.bin
88+
target/thumbv6m-none-eabi/release/c1minimal.uf2
8689
8790
linting:
8891
name: Linting

.github/workflows/software.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Software Checks
1+
name: Software
22

33
on:
44
push:

.github/workflows/traditional-cargo.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Test builds without cargo-make
22
# Not the recommended path, but should make sure it still works
3-
name: Traditional Cargo Workflow
3+
name: Traditional Cargo
44

55
on:
66
push:
@@ -75,7 +75,7 @@ jobs:
7575
run: cargo run --release --target x86_64-pc-windows-msvc -p inputmodule-control -- --help | grep 'RAW HID and VIA commandline'
7676

7777
lint-format:
78-
name: Lint and format check
78+
name: Lint and format
7979
runs-on: ubuntu-latest
8080
steps:
8181
- uses: actions/checkout@v3

0 commit comments

Comments
 (0)