From aeabf0447d63c01ea1ebf9f75719369586e1207b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=82=E3=81=8F?= Date: Sun, 7 Jul 2024 13:00:39 +0100 Subject: [PATCH 1/2] [FL-3704] Updater: reset various debug flags on production build flash (#3762) --- applications/system/updater/util/update_task_worker_flasher.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/applications/system/updater/util/update_task_worker_flasher.c b/applications/system/updater/util/update_task_worker_flasher.c index 40f58f462..0c7881e63 100644 --- a/applications/system/updater/util/update_task_worker_flasher.c +++ b/applications/system/updater/util/update_task_worker_flasher.c @@ -348,6 +348,8 @@ int32_t update_task_worker_flash_writer(void* context) { // Production furi_hal_rtc_set_log_level(FuriLogLevelDefault); furi_hal_rtc_reset_flag(FuriHalRtcFlagDebug); + furi_hal_rtc_reset_flag(FuriHalRtcFlagLegacySleep); + furi_hal_rtc_set_heap_track_mode(FuriHalRtcHeapTrackModeNone); #endif update_task_set_progress(update_task, UpdateTaskStageCompleted, 100); success = true; From 9161af293ad7d8227fa6258c8f44a3b2ebe834c2 Mon Sep 17 00:00:00 2001 From: Konstantin Volkov <72250702+doomwastaken@users.noreply.github.com> Date: Sun, 7 Jul 2024 18:56:08 +0300 Subject: [PATCH 2/2] Increase github action timeouts (#3763) Co-authored-by: doomwastaken --- .github/workflows/updater_test.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/updater_test.yml b/.github/workflows/updater_test.yml index 45bc53c38..dbe5df883 100644 --- a/.github/workflows/updater_test.yml +++ b/.github/workflows/updater_test.yml @@ -33,7 +33,7 @@ jobs: run: | source scripts/toolchain/fbtenv.sh ./fbt flash_usb_full PORT=${{steps.device.outputs.flipper}} FORCE=1 - python3 scripts/testops.py -p=${{steps.device.outputs.flipper}} -t=120 await_flipper + python3 scripts/testops.py -p=${{steps.device.outputs.flipper}} -t=180 await_flipper - name: 'Validating updater' id: second_full_flash @@ -42,7 +42,7 @@ jobs: run: | source scripts/toolchain/fbtenv.sh ./fbt flash_usb PORT=${{steps.device.outputs.flipper}} FORCE=1 - python3 scripts/testops.py -p=${{steps.device.outputs.flipper}} -t=120 await_flipper + python3 scripts/testops.py -p=${{steps.device.outputs.flipper}} -t=180 await_flipper - name: 'Get last release tag' id: release_tag @@ -69,5 +69,5 @@ jobs: if: failure() run: | source scripts/toolchain/fbtenv.sh - python3 scripts/testops.py -p=${{steps.device.outputs.flipper}} -t=120 await_flipper + python3 scripts/testops.py -p=${{steps.device.outputs.flipper}} -t=180 await_flipper python3 scripts/storage.py -p ${{steps.device.outputs.flipper}} format_ext