From 32f99417ccd0abf3ec2bfc6847334cf74ec6eb7b Mon Sep 17 00:00:00 2001 From: hedger Date: Tue, 9 May 2023 03:20:33 +0400 Subject: [PATCH 1/3] Fixed include paths --- scenes/uart_terminal_scene_console_output.c | 2 +- scenes/uart_terminal_scene_start.c | 2 +- scenes/uart_terminal_scene_text_input.c | 2 +- uart_terminal_app_i.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scenes/uart_terminal_scene_console_output.c b/scenes/uart_terminal_scene_console_output.c index a930d4ab3a9..81e289d1cfc 100644 --- a/scenes/uart_terminal_scene_console_output.c +++ b/scenes/uart_terminal_scene_console_output.c @@ -1,4 +1,4 @@ -#include "applications/external/lora_terminal/uart_terminal_app_i.h" +#include "../uart_terminal_app_i.h" #include #include #define appName "lora_terminal" diff --git a/scenes/uart_terminal_scene_start.c b/scenes/uart_terminal_scene_start.c index df426bcd77e..b20ee709659 100644 --- a/scenes/uart_terminal_scene_start.c +++ b/scenes/uart_terminal_scene_start.c @@ -1,4 +1,4 @@ -#include "applications/external/lora_terminal/uart_terminal_app_i.h" +#include "../uart_terminal_app_i.h" #include // For each command, define whether additional arguments are needed diff --git a/scenes/uart_terminal_scene_text_input.c b/scenes/uart_terminal_scene_text_input.c index b9805d564b5..62c0792d44c 100644 --- a/scenes/uart_terminal_scene_text_input.c +++ b/scenes/uart_terminal_scene_text_input.c @@ -1,4 +1,4 @@ -#include "applications/external/lora_terminal/uart_terminal_app_i.h" +#include "../uart_terminal_app_i.h" void uart_terminal_scene_text_input_callback(void* context) { UART_TerminalApp* app = context; diff --git a/uart_terminal_app_i.h b/uart_terminal_app_i.h index 61c672d4a0a..6b1996eb514 100644 --- a/uart_terminal_app_i.h +++ b/uart_terminal_app_i.h @@ -1,7 +1,7 @@ #pragma once #include "uart_terminal_app.h" -#include "applications/external/lora_terminal/scenes/uart_terminal_scene.h" +#include "scenes/uart_terminal_scene.h" #include "uart_terminal_custom_event.h" #include "uart_terminal_uart.h" From 5f16ee6e7808cd5f10a715ae7a750ac0f34b23e4 Mon Sep 17 00:00:00 2001 From: hedger Date: Tue, 9 May 2023 03:25:07 +0400 Subject: [PATCH 2/3] github: added automated builds --- .github/workflows/build.yml | 42 +++++++++++++++++++++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 .github/workflows/build.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 00000000000..c8df9c79e75 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,42 @@ +name: "FAP: Build for multiple SDK sources" + +on: + push: + branches: + - main + pull_request: + schedule: + # do a build every day + - cron: "1 1 * * *" + +jobs: + ufbt-build: + runs-on: ubuntu-latest + strategy: + matrix: + include: + - name: dev channel + sdk-channel: dev + - name: release channel + sdk-channel: release + - name: Unleashed dev + sdk-index-url: https://up.unleashedflip.com/directory.json + sdk-channel: dev + - name: Unleashed release + sdk-index-url: https://up.unleashedflip.com/directory.json + sdk-channel: release + name: 'ufbt: Build for ${{ matrix.name }}' + steps: + - name: Checkout + uses: actions/checkout@v3 + - name: Build with ufbt + uses: flipperdevices/flipperzero-ufbt-action@v0.1.1 + id: build-app + with: + sdk-channel: ${{ matrix.sdk-channel }} + - name: Upload app artifacts + uses: actions/upload-artifact@v3 + with: + # See ufbt action docs for other output variables + name: ${{ github.event.repository.name }}-${{ steps.build-app.outputs.suffix }} + path: ${{ steps.build-app.outputs.fap-artifacts }} From 667404b6a64a43b41578c1ccc456386e33a0a389 Mon Sep 17 00:00:00 2001 From: hedger Date: Tue, 9 May 2023 03:27:53 +0400 Subject: [PATCH 3/3] github: added missing sdk index url --- .github/workflows/build.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index c8df9c79e75..a86c7c35404 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -34,6 +34,7 @@ jobs: id: build-app with: sdk-channel: ${{ matrix.sdk-channel }} + sdk-index-url: ${{ matrix.sdk-index-url }} - name: Upload app artifacts uses: actions/upload-artifact@v3 with: