From 642e2ecfc7121e7129221a1572aaa029f791ec19 Mon Sep 17 00:00:00 2001 From: Gaurav-Aggarwal-AWS <33462878+aggarg@users.noreply.github.com> Date: Wed, 22 Jan 2025 22:30:10 +0530 Subject: [PATCH] Fix CI failures (#1322) Signed-off-by: Gaurav Aggarwal <aggarg@amazon.com> --- .github/scripts/core_checker.py | 3 ++- .github/workflows/ci.yml | 1 + .github/workflows/freertos_demos.yml | 12 ++++++++---- FreeRTOS/Source | 2 +- manifest.yml | 2 +- 5 files changed, 13 insertions(+), 7 deletions(-) diff --git a/.github/scripts/core_checker.py b/.github/scripts/core_checker.py index e718946bb7..34bbc29daa 100755 --- a/.github/scripts/core_checker.py +++ b/.github/scripts/core_checker.py @@ -331,7 +331,8 @@ FREERTOS_IGNORED_PATTERNS = [ r'FreeRTOS/Demo/AVR32_UC3/FreeRTOSConfig.h', r'FreeRTOS/Demo/RX700_RX72N_EnvisionKit_GCC_e2studio/src/smc_gen/.*', r'FreeRTOS/Demo/RX700_RX72N_EnvisionKit_IAR_e2studio_EWRX/src/smc_gen/.*', - r'FreeRTOS/Demo/RX700_RX72N_EnvisionKit_Renesas_e2studio_CS\+/src/smc_gen/.*' + r'FreeRTOS/Demo/RX700_RX72N_EnvisionKit_Renesas_e2studio_CS\+/src/smc_gen/.*', + r'FreeRTOS/Demo/CORTEX_MPS2_QEMU_IAR_GCC/TraceRecorderConfig/.*' ] FREERTOS_IGNORED_FILES = [ diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index b9efe89356..384e926436 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -90,6 +90,7 @@ jobs: # List of directories containing libraries whose doxygen output will be generated. libs_parent_dir_path: FreeRTOS-Plus/Source,FreeRTOS-Plus/Source/AWS,FreeRTOS-Plus/Source/Application-Protocols,FreeRTOS-Plus/Source/Utilities generate_zip: true + doxygen_dependencies: libclang-18-dev libclang-cpp18 graphviz - name: Upload doxygen artifact if main branch if: success() && ( github.ref == 'refs/heads/main' || github.ref == 'refs/heads/release-candidate' ) env: diff --git a/.github/workflows/freertos_demos.yml b/.github/workflows/freertos_demos.yml index 0a21b618c2..ff7c0fd4e3 100644 --- a/.github/workflows/freertos_demos.yml +++ b/.github/workflows/freertos_demos.yml @@ -406,8 +406,12 @@ jobs: # ${{ env.stepName }} echo -e "::group::${{ env.stepName }}" set +e - sudo apt-get -y update - sudo apt-get -y install gcc-msp430 build-essential + curl -L -O https://dr-download.ti.com/software-development/ide-configuration-compiler-or-debugger/MD-LlCjWuAbzH/9.3.1.2/msp430-gcc-full-linux-x64-installer-9.3.1.2.7z + sudo apt update -y + sudo apt install -y p7zip-full + 7z x ./msp430-gcc-full-linux-x64-installer-9.3.1.2.7z + chmod +x ./msp430-gcc-full-linux-x64-installer-9.3.1.2.run + sudo ./msp430-gcc-full-linux-x64-installer-9.3.1.2.run --prefix /usr/bin/msp430-gcc --mode unattended exitStatus=$? set -e echo -e "::endgroup::" @@ -427,7 +431,7 @@ jobs: # ${{ env.stepName }} echo -e "::group::${{ env.stepName }}" set +e - make -j + make -j CC=/usr/bin/msp430-gcc/bin/msp430-elf-gcc OPT="-Os -I/usr/bin/msp430-gcc/include -L/usr/bin/msp430-gcc/include" exitStatus=$? set -e echo -e "::endgroup::" @@ -476,7 +480,7 @@ jobs: set +e sudo apt-get -y update sudo apt-get -y install gcc-arm-none-eabi build-essential cmake git ninja-build python3-minimal - sudo apt-get -y install qemu-system-arm qemu-efi + sudo apt-get -y install qemu-system-arm qemu-efi-arm exitStatus=$? set -e echo -e "::endgroup::" diff --git a/FreeRTOS/Source b/FreeRTOS/Source index f31787d35d..1b8f5965d3 160000 --- a/FreeRTOS/Source +++ b/FreeRTOS/Source @@ -1 +1 @@ -Subproject commit f31787d35d5614620fc6fefa6c12df2583612fcf +Subproject commit 1b8f5965d360953ebf5559c97418f5f5264bdbee diff --git a/manifest.yml b/manifest.yml index 3b10b0a7b4..dcf0bcb4f8 100644 --- a/manifest.yml +++ b/manifest.yml @@ -5,7 +5,7 @@ license: "MIT" dependencies: - name: "FreeRTOS-Kernel" - version: "f31787d" + version: "1b8f596" repository: type: "git" url: "https://github.com/FreeRTOS/FreeRTOS-Kernel.git"