diff options
| author | Francesco Gazzetta <fgaz@fgaz.me> | 2021-12-31 17:39:50 (GMT) |
|---|---|---|
| committer | Daniel Thompson <daniel.thompson@linaro.org> | 2022-01-10 22:35:04 (GMT) |
| commit | 01c173927ec70467b74652297518bf7e2032cfaf (patch) | |
| tree | 124e49292091481e47855ab4bd85cbaf06cd225e | |
| parent | b8a50db03c1f7655b846c59d6903e27d54bd82ae (diff) | |
Add make and CI rules for building apps .mpy files
Signed-off-by: Francesco Gazzetta <fgaz@fgaz.me>
| -rw-r--r-- | .github/workflows/main.yml | 13 | ||||
| -rw-r--r-- | Makefile | 11 |
2 files changed, 23 insertions, 1 deletions
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index b0caa58..113be50 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -60,6 +60,12 @@ jobs: make -j `nproc` VERSION=${{ github.sha }} dist mv ../wasp-os-${{ github.sha }}.tar.gz . + - name: Build extra apps + id: apps + run: | + export PATH=$PATH:${{ runner.temp }}/arm-none-eabi/bin + make -j `nproc` apps + - name: Upload full binary distribution id: upload-binaries uses: actions/upload-artifact@v2 @@ -87,3 +93,10 @@ jobs: with: name: k9-${{ github.sha }} path: build-k9 + + - name: Upload extra apps binaries + id: upload-apps + uses: actions/upload-artifact@v2 + with: + name: apps-${{ github.sha }} + path: apps/*.mpy @@ -58,8 +58,10 @@ wasp/boards/$(BOARD_SAFE)/watch.py : wasp/boards/$(BOARD_SAFE)/watch.py.in (cd wasp; ../tools/preprocess.py boards/$(BOARD)/watch.py.in > boards/$(BOARD)/watch.py) \ || ($(RM) wasp/boards/$(BOARD)/watch.py; false) -micropython: build-$(BOARD_SAFE) wasp/boards/$(BOARD_SAFE)/watch.py +micropython/mpy-cross/mpy-cross: $(MAKE) -C micropython/mpy-cross + +micropython: build-$(BOARD_SAFE) wasp/boards/$(BOARD_SAFE)/watch.py micropython/mpy-cross/mpy-cross $(RM) micropython/ports/nrf/build-$(BOARD)-s132/frozen_content.c $(MAKE) -C micropython/ports/nrf \ BOARD=$(BOARD) SD=s132 \ @@ -89,6 +91,13 @@ debug: -ex "attach 1" \ -ex "load" +apps/%.mpy: apps/%.py micropython/mpy-cross/mpy-cross + ./micropython/mpy-cross/mpy-cross -mno-unicode -march=armv7m $< +APPS_PY=$(wildcard apps/*.py) +APPS_MPY=$(APPS_PY:%.py=%.mpy) +.PHONY: apps +apps: $(APPS_MPY) + docs: $(RM) -rf docs/build/html/* $(MAKE) -C docs html |