Skip to content

Commit 5994446

Browse files
Mikefly123hrfarmerasiemsennateinaction
authored
Added Bootloader Check (#46)
* bootloader script * automatic gds start wip * wip changes Co-authored-by: Aaron Siemsen <[email protected]> * add wip yaml * thing * oops * a * d * idk * bruh * add token * delete decompress * add make step * add uv dependency * sure * add back build dependency * sure * ye * add make submodules * gh * copy it * ls * orrect path * c * jfkdljfkldajklfjsdkal * add the thingy * longer sleep * d * add picotool reboot * test * uncomment dependencies * Try dockerizing * Reduce image load time * Fix Dockerfile * Fix Dockerfile * Change layer order to improve caching * Fix Docker run * a * updates * delete docker * Add setup guide * add note to setup guide * Add sudo to picotool udev rules setup commands Updated commands to include 'sudo' for proper permissions. * Added Bootloader Check * Change runner for integration job to 'deathstar' * Update CI workflow to use 'deathstar' runner Changed the runner for lint and build jobs from 'ubuntu-latest' to 'deathstar'. --------- Co-authored-by: aychar <[email protected]> Co-authored-by: Aaron Siemsen <[email protected]> Co-authored-by: Nate Gay <[email protected]>
1 parent 4bbe9bc commit 5994446

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

.github/workflows/ci.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ on:
88

99
jobs:
1010
lint:
11-
runs-on: ubuntu-latest
11+
runs-on: deathstar
1212
steps:
1313
- uses: actions/checkout@v4
1414
- name: Lint
1515
run: |
1616
make fmt
1717
build:
18-
runs-on: ubuntu-latest
18+
runs-on: deathstar
1919
steps:
2020
- name: Checkout repository
2121
uses: actions/checkout@v4
@@ -106,7 +106,7 @@ jobs:
106106
build-artifacts/zephyr/fprime-zephyr-deployment/dict/ReferenceDeploymentTopologyDictionary.json
107107
retention-days: 30
108108
integration:
109-
runs-on: [self-hosted, integration]
109+
runs-on: [integration]
110110
needs: build
111111
steps:
112112
- uses: actions/checkout@v4

Makefile

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,12 @@ test-integration: uv
7070

7171
.PHONY: bootloader
7272
bootloader: uv
73-
@$(UV) run pytest FprimeZephyrReference/test/bootloader_trigger.py --deployment build-artifacts/zephyr/fprime-zephyr-deployment
73+
@if [ -d "/Volumes/RP2350" ] || [ -d "/Volumes/RPI-RP2" ] || ls /media/*/RP2350 2>/dev/null || ls /media/*/RPI-RP2 2>/dev/null; then \
74+
echo "RP2350 already in bootloader mode - skipping trigger"; \
75+
else \
76+
echo "RP2350 not in bootloader mode - triggering bootloader"; \
77+
$(UV) run pytest FprimeZephyrReference/test/bootloader_trigger.py --deployment build-artifacts/zephyr/fprime-zephyr-deployment; \
78+
fi
7479

7580
.PHONY: clean
7681
clean: ## Remove all gitignored files

0 commit comments

Comments
 (0)