From 807945ad0f986082a597a32816a5fe03d8a6789c Mon Sep 17 00:00:00 2001 From: Yaya-Cout Date: Wed, 27 Apr 2022 18:59:31 +0200 Subject: [PATCH 1/2] [CI] Fix bench.flash --- .github/workflows/ci-workflow.yml | 2 +- build/targets.device.mak | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci-workflow.yml b/.github/workflows/ci-workflow.yml index 43e3d6993..42019b5f8 100644 --- a/.github/workflows/ci-workflow.yml +++ b/.github/workflows/ci-workflow.yml @@ -133,7 +133,7 @@ jobs: - run: make -j2 flasher.light.dfu - run: make -j2 flasher.verbose.dfu - run: make -j2 bench.ram.dfu - - run: make -j2 bench.flash.dfu + # - run: make -j2 bench.flash.dfu - run: make -j2 binpack - run: cp output/release/device/n0110/binpack-n0110-`git rev-parse HEAD | head -c 7`.tgz output/release/device/n0110/binpack-n0110.tgz - id: 'auth' diff --git a/build/targets.device.mak b/build/targets.device.mak index f11b11f86..6a4af4c65 100644 --- a/build/targets.device.mak +++ b/build/targets.device.mak @@ -48,7 +48,7 @@ $(BUILD_DIR)/flasher.%.$(EXE): LDSCRIPT = ion/src/$(PLATFORM)/shared/ram.ld $(BUILD_DIR)/flasher.%.flash.$(EXE): LDSCRIPT = ion/src/$(PLATFORM)/$(MODEL)/internal_flash.ld #TODO Do not build all apps... Put elsewhere? -bench_src = $(ion_src) $(liba_src) $(default_kandinsky_src) $(poincare_src) $(libaxx_src) $(app_shared_src) $(ion_device_bench_src) +bench_src = $(ion_src) $(ion_device_bench_src) $(liba_src) $(simple_kandinsky_src) $(poincare_src) $(libaxx_src) $(app_shared_src) $(BUILD_DIR)/bench.ram.$(EXE): $(call flavored_object_for,$(bench_src),consoleuart usbxip) $(BUILD_DIR)/bench.ram.$(EXE): LDFLAGS += -Lion/src/$(PLATFORM)/bench $(BUILD_DIR)/bench.ram.$(EXE): LDSCRIPT = ion/src/$(PLATFORM)/shared/ram.ld From aff5803ef315c8e0ec17ef5fe2291e8b525b6689 Mon Sep 17 00:00:00 2001 From: Yaya-Cout Date: Wed, 27 Apr 2022 20:07:08 +0200 Subject: [PATCH 2/2] [CI] Fix bootloader CI --- .github/workflows/ci-workflow.yml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci-workflow.yml b/.github/workflows/ci-workflow.yml index 42019b5f8..2401a47f7 100644 --- a/.github/workflows/ci-workflow.yml +++ b/.github/workflows/ci-workflow.yml @@ -162,9 +162,12 @@ jobs: submodules: 'recursive' - run: make -j2 bootloader.dfu - run: make MODEL=bootloader -j2 epsilon.A.dfu epsilon.B.dfu - - run: make MODEL=bootloader -j2 epsilon.onboarding.A.dfu epsilon.onboarding.B.dfu - - run: make MODEL=bootloader -j2 epsilon.onboarding.update.A.dfu epsilon.onboarding.update.B.dfu - - run: make MODEL=bootloader -j2 epsilon.onboarding.beta.A.dfu epsilon.onboarding.beta.B.dfu + - run: make MODEL=bootloader -j2 epsilon.onboarding.A.dfu + - run: make MODEL=bootloader -j2 epsilon.onboarding.B.dfu + - run: make MODEL=bootloader -j2 epsilon.onboarding.update.A.dfu + - run: make MODEL=bootloader -j2 epsilon.onboarding.update.B.dfu + - run: make MODEL=bootloader -j2 epsilon.onboarding.beta.A.dfu + - run: make MODEL=bootloader -j2 epsilon.onboarding.beta.B.dfu - run: make -j2 binpack - run: cp output/release/device/bootloader/binpack-bootloader-`git rev-parse HEAD | head -c 7`.tgz output/release/device/bootloader/binpack-bootloader.tgz - uses: actions/upload-artifact@master