From 4f8917d5656440a66018405a51d06eb19bce8fc7 Mon Sep 17 00:00:00 2001 From: Daniel Schaefer Date: Tue, 19 Sep 2023 10:02:10 +0800 Subject: [PATCH 1/3] gh-actions: Simplify names Signed-off-by: Daniel Schaefer --- .github/workflows/firmware.yml | 2 +- .github/workflows/software.yml | 2 +- .github/workflows/traditional-cargo.yml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/firmware.yml b/.github/workflows/firmware.yml index 0ef133cf..3eec3208 100644 --- a/.github/workflows/firmware.yml +++ b/.github/workflows/firmware.yml @@ -1,4 +1,4 @@ -name: Firmware Checks +name: Firmware on: push: diff --git a/.github/workflows/software.yml b/.github/workflows/software.yml index 642fbbdb..d65c8aee 100644 --- 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 index 67b28cb9..fcd96c49 100644 --- 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 From 3bc94691bccdce7636d4ae9e1ba5f53a050db7e5 Mon Sep 17 00:00:00 2001 From: Daniel Schaefer Date: Tue, 19 Sep 2023 10:02:24 +0800 Subject: [PATCH 2/3] gh-actions: Fix cargo-make uploads Signed-off-by: Daniel Schaefer --- .github/workflows/firmware.yml | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/.github/workflows/firmware.yml b/.github/workflows/firmware.yml index 3eec3208..a9c0afef 100644 --- a/.github/workflows/firmware.yml +++ b/.github/workflows/firmware.yml @@ -63,26 +63,29 @@ jobs: with: name: inputmodule_fw_bin 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 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 path: | - c1minimal.bin - c1minimal.uf2 + target/thumbv6m-none-eabi/release/c1minimal.bin + target/thumbv6m-none-eabi/release/c1minimal.uf2 linting: name: Linting From 9b5d870940315aa7f2af47ad6403e29af2fa8a7c Mon Sep 17 00:00:00 2001 From: Daniel Schaefer Date: Tue, 19 Sep 2023 10:20:12 +0800 Subject: [PATCH 3/3] gh-actions: Make sure modules are in separate uploads Signed-off-by: Daniel Schaefer --- .github/workflows/firmware.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/firmware.yml b/.github/workflows/firmware.yml index a9c0afef..64603a4f 100644 --- a/.github/workflows/firmware.yml +++ b/.github/workflows/firmware.yml @@ -61,7 +61,7 @@ jobs: - name: Upload ledmatrix files uses: actions/upload-artifact@v3 with: - name: inputmodule_fw_bin + name: ledmatrix_fw_${{github.sha}} path: | # Main firmware target/thumbv6m-none-eabi/release/ledmatrix.bin @@ -74,7 +74,7 @@ jobs: - name: Upload b1display files uses: actions/upload-artifact@v3 with: - name: inputmodule_fw_uf2 + name: b1display_fw_${{github.sha}} path: | target/thumbv6m-none-eabi/release/b1display.bin target/thumbv6m-none-eabi/release/b1display.uf2 @@ -82,7 +82,7 @@ jobs: - name: Upload c1minimal files uses: actions/upload-artifact@v3 with: - name: inputmodule_fw_uf2 + name: c1minimal_fw_${{github.sha}} path: | target/thumbv6m-none-eabi/release/c1minimal.bin target/thumbv6m-none-eabi/release/c1minimal.uf2