From e5b703a8b9d8d35fdb9402243e50084761121b6d Mon Sep 17 00:00:00 2001 From: Rahul Kar Date: Mon, 26 May 2025 08:56:15 +0000 Subject: [PATCH 01/17] Update download locations to outside repository content --- .github/workflows/build.yaml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 259bf9de2..a393cd4b1 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -59,11 +59,13 @@ jobs: if: ${{ steps.cache.outputs.cache-hit != 'true' }} run: | mkdir -p ~/cache + pushd $HOME wget "${{ matrix.ide_pkg_url }}" -U "${{ matrix.user_agent }}" unzip en.${IDE_PKG_NAME}.sh.zip chmod +x ${IDE_PKG_NAME}.sh ./${IDE_PKG_NAME}.sh --tar -xf ./${IDE_PKG_NAME}.tar.gz mv ${IDE_PKG_NAME}.tar.gz ~/cache/ + popd - name: Extract IDE run: | mkdir -p STM32CubeIDE @@ -152,9 +154,11 @@ jobs: run: | export PATH="$(realpath ~/scoop)/shims:${PATH}" mkdir -p ~/cache + pushd $HOME wget "${{ matrix.ide_pkg_url }}" -U "${{ matrix.user_agent }}" 7z x en.${{ matrix.ide_pkg_name }}.exe.zip mv ${{ matrix.ide_pkg_name }}.exe ~/cache/${{ matrix.ide_pkg_name }}.exe + popd - name: Extract IDE shell: bash run: | From b2d28e0717b424b0c82422201c9d10cc67e7e2f4 Mon Sep 17 00:00:00 2001 From: Rahul Kar Date: Mon, 26 May 2025 09:55:06 +0000 Subject: [PATCH 02/17] Fix ubuntu version --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a2ca63118..e8fe9d90c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,7 +17,7 @@ on: jobs: formatting: - runs-on: ubuntu-20.04 + runs-on: ubuntu-latest steps: - uses: actions/checkout@v3 - name: Check Formatting of Files From 48bfd9ec2e32700e05389c2a739fac6b2a5b2d68 Mon Sep 17 00:00:00 2001 From: Rahul Kar Date: Mon, 26 May 2025 10:46:36 +0000 Subject: [PATCH 03/17] Add words in SpellWords.txt --- .github/.cSpellWords.txt | 6 ++++++ Common/app/env_sensor_publish.c | 10 +++++----- Common/app/motion_sensors_publish.c | 8 ++++---- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/.github/.cSpellWords.txt b/.github/.cSpellWords.txt index cadd881d6..3187782b1 100644 --- a/.github/.cSpellWords.txt +++ b/.github/.cSpellWords.txt @@ -23,6 +23,7 @@ CDMF CECS CFGR CIER +CLKSOURCE CMAC CMOCK CMSE @@ -126,6 +127,8 @@ LPUART LPWORD LPWRRSTF LTDC +LWIPOPTS +LWIPERF LYNKS Lenx MBED @@ -203,6 +206,7 @@ RDSR RECVMBOX RELAYX REXTI +RINGCLKSOURCE RRCC RSAES RSASSA @@ -231,6 +235,8 @@ SSLV STLEXH STLK SYSCFGEN +SYSCLK +SYSCLKSOURCE Signa TCEM TKIP diff --git a/Common/app/env_sensor_publish.c b/Common/app/env_sensor_publish.c index 5bca76871..f95611172 100644 --- a/Common/app/env_sensor_publish.c +++ b/Common/app/env_sensor_publish.c @@ -58,7 +58,7 @@ #define MQTT_PUBLISH_MAX_LEN ( 512 ) #define MQTT_PUBLISH_TIME_BETWEEN_MS ( 1000 ) #define MQTT_PUBLISH_TOPIC "env_sensor_data" -#define MQTT_PUBLICH_TOPIC_STR_LEN ( 256 ) +#define MQTT_PUBLISH_TOPIC_STR_LEN ( 256 ) #define MQTT_PUBLISH_BLOCK_TIME_MS ( 1000 ) #define MQTT_PUBLISH_NOTIFICATION_WAIT_MS ( 1000 ) @@ -246,7 +246,7 @@ void vEnvironmentSensorPublishTask( void * pvParameters ) BaseType_t xExitFlag = pdFALSE; char payloadBuf[ MQTT_PUBLISH_MAX_LEN ]; MQTTAgentHandle_t xAgentHandle = NULL; - char pcTopicString[ MQTT_PUBLICH_TOPIC_STR_LEN ] = { 0 }; + char pcTopicString[ MQTT_PUBLISH_TOPIC_STR_LEN ] = { 0 }; size_t uxTopicLen = 0; ( void ) pvParameters; @@ -259,14 +259,14 @@ void vEnvironmentSensorPublishTask( void * pvParameters ) vTaskDelete( NULL ); } - uxTopicLen = KVStore_getString( CS_CORE_THING_NAME, pcTopicString, MQTT_PUBLICH_TOPIC_STR_LEN ); + uxTopicLen = KVStore_getString( CS_CORE_THING_NAME, pcTopicString, MQTT_PUBLISH_TOPIC_STR_LEN ); if( uxTopicLen > 0 ) { - uxTopicLen = strlcat( pcTopicString, "/" MQTT_PUBLISH_TOPIC, MQTT_PUBLICH_TOPIC_STR_LEN ); + uxTopicLen = strlcat( pcTopicString, "/" MQTT_PUBLISH_TOPIC, MQTT_PUBLISH_TOPIC_STR_LEN ); } - if( ( uxTopicLen == 0 ) || ( uxTopicLen >= MQTT_PUBLICH_TOPIC_STR_LEN ) ) + if( ( uxTopicLen == 0 ) || ( uxTopicLen >= MQTT_PUBLISH_TOPIC_STR_LEN ) ) { LogError( "Failed to construct topic string." ); xExitFlag = pdTRUE; diff --git a/Common/app/motion_sensors_publish.c b/Common/app/motion_sensors_publish.c index f1ee8f034..0d1b733aa 100644 --- a/Common/app/motion_sensors_publish.c +++ b/Common/app/motion_sensors_publish.c @@ -67,7 +67,7 @@ */ #define MQTT_PUBLISH_MAX_LEN ( 200 ) #define MQTT_PUBLISH_PERIOD_MS ( 500 ) -#define MQTT_PUBLICH_TOPIC_STR_LEN ( 256 ) +#define MQTT_PUBLISH_TOPIC_STR_LEN ( 256 ) #define MQTT_PUBLISH_BLOCK_TIME_MS ( 200 ) #define MQTT_PUBLISH_NOTIFICATION_WAIT_MS ( 1000 ) #define MQTT_NOTIFY_IDX ( 1 ) @@ -222,7 +222,7 @@ void vMotionSensorsPublish( void * pvParameters ) MQTTAgentHandle_t xAgentHandle = NULL; char pcPayloadBuf[ MQTT_PUBLISH_MAX_LEN ]; - char pcTopicString[ MQTT_PUBLICH_TOPIC_STR_LEN ] = { 0 }; + char pcTopicString[ MQTT_PUBLISH_TOPIC_STR_LEN ] = { 0 }; char * pcDeviceId = NULL; int lTopicLen = 0; @@ -242,10 +242,10 @@ void vMotionSensorsPublish( void * pvParameters ) } else { - lTopicLen = snprintf( pcTopicString, ( size_t ) MQTT_PUBLICH_TOPIC_STR_LEN, "%s/motion_sensor_data", pcDeviceId ); + lTopicLen = snprintf( pcTopicString, ( size_t ) MQTT_PUBLISH_TOPIC_STR_LEN, "%s/motion_sensor_data", pcDeviceId ); } - if( ( lTopicLen <= 0 ) || ( lTopicLen > MQTT_PUBLICH_TOPIC_STR_LEN ) ) + if( ( lTopicLen <= 0 ) || ( lTopicLen > MQTT_PUBLISH_TOPIC_STR_LEN ) ) { LogError( "Error while constructing topic string." ); xExitFlag = pdTRUE; From 2f01b263937422dff87d9ebc8adeca5240281d70 Mon Sep 17 00:00:00 2001 From: Rahul Kar Date: Mon, 26 May 2025 10:50:44 +0000 Subject: [PATCH 04/17] Fix spell check --- .github/.cSpellWords.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/.cSpellWords.txt b/.github/.cSpellWords.txt index 3187782b1..b7eee8b5c 100644 --- a/.github/.cSpellWords.txt +++ b/.github/.cSpellWords.txt @@ -70,6 +70,7 @@ FORTEZZA FRACN FRACR FRCK +FREERUNCLK Fithb Fqcumd GMAC @@ -207,6 +208,7 @@ RECVMBOX RELAYX REXTI RINGCLKSOURCE +RNGCLKSOURCE RRCC RSAES RSASSA From 484fcf72d14101114a6b08e2677204a91fb1ba24 Mon Sep 17 00:00:00 2001 From: Rahul Kar Date: Tue, 27 May 2025 07:31:16 +0000 Subject: [PATCH 05/17] Fix manifest verifier --- .github/workflows/ci.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e8fe9d90c..f89cabfc8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -52,7 +52,6 @@ jobs: - name: Run manifest verifier uses: FreeRTOS/CI-CD-GitHub-Actions/manifest-verifier@main with: - path: ./ fail-on-incorrect-version: true git-secrets: From 485680343c4f494fe2be26a9f5d930c8927b28e2 Mon Sep 17 00:00:00 2001 From: Rahul Kar Date: Tue, 27 May 2025 07:43:20 +0000 Subject: [PATCH 06/17] Fix manifest verifier for submodule repos --- .github/workflows/ci.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f89cabfc8..5e0ca881f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -49,9 +49,17 @@ jobs: submodules: true fetch-depth: 0 + # At time of writing the gitmodules are set not to pull + # Even when using fetch submodules. Need to run this command + # To force it to grab them. + - name: Perform Recursive Clone + shell: bash + run: git submodule update --checkout --init --recursive + - name: Run manifest verifier uses: FreeRTOS/CI-CD-GitHub-Actions/manifest-verifier@main with: + path: ./ fail-on-incorrect-version: true git-secrets: From be9caab0e84a3ddb2887f9b09edb79110e210b49 Mon Sep 17 00:00:00 2001 From: Rahul Kar Date: Tue, 27 May 2025 08:11:31 +0000 Subject: [PATCH 07/17] Fix manifest.yml --- manifest.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.yml b/manifest.yml index 117da5664..41b5f0e51 100644 --- a/manifest.yml +++ b/manifest.yml @@ -178,7 +178,7 @@ dependencies: url: "https://github.com/STMicroelectronics/stm32-iis2mdc.git" path: "Drivers/BSP/Components/iis2mdc" - name : "stm32-lsm6dso" - version: "v1.5.3" + version: "v1.5.0" repository: type: "git" url: "https://github.com/STMicroelectronics/stm32-lsm6dso.git" From e64838ea18b2f3c2014711703aa43af19222ff35 Mon Sep 17 00:00:00 2001 From: Rahul Kar Date: Tue, 27 May 2025 08:26:21 +0000 Subject: [PATCH 08/17] Excluse drivers from manifest verification --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5e0ca881f..41e83491f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -60,6 +60,7 @@ jobs: uses: FreeRTOS/CI-CD-GitHub-Actions/manifest-verifier@main with: path: ./ + exclude-dirs: Drivers fail-on-incorrect-version: true git-secrets: From 02c5d83deefd841309e4933984e72f43ec9c26bc Mon Sep 17 00:00:00 2001 From: Rahul Kar Date: Tue, 27 May 2025 09:01:53 +0000 Subject: [PATCH 09/17] Remove warning in ci.yml --- .github/workflows/ci.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 41e83491f..9ad85f300 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -60,7 +60,8 @@ jobs: uses: FreeRTOS/CI-CD-GitHub-Actions/manifest-verifier@main with: path: ./ - exclude-dirs: Drivers + exclude-submodules: | + Drivers/BSP/Components/lsm6dso fail-on-incorrect-version: true git-secrets: From 50418a83d4a221af4607c4f644e559053ebeeddd Mon Sep 17 00:00:00 2001 From: Rahul Kar Date: Wed, 28 May 2025 06:00:28 +0000 Subject: [PATCH 10/17] Remove lsm6dso from manifest --- .github/workflows/ci.yml | 2 -- manifest.yml | 6 ------ 2 files changed, 8 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9ad85f300..5e0ca881f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -60,8 +60,6 @@ jobs: uses: FreeRTOS/CI-CD-GitHub-Actions/manifest-verifier@main with: path: ./ - exclude-submodules: | - Drivers/BSP/Components/lsm6dso fail-on-incorrect-version: true git-secrets: diff --git a/manifest.yml b/manifest.yml index 41b5f0e51..6ec5c019e 100644 --- a/manifest.yml +++ b/manifest.yml @@ -177,12 +177,6 @@ dependencies: type: "git" url: "https://github.com/STMicroelectronics/stm32-iis2mdc.git" path: "Drivers/BSP/Components/iis2mdc" - - name : "stm32-lsm6dso" - version: "v1.5.0" - repository: - type: "git" - url: "https://github.com/STMicroelectronics/stm32-lsm6dso.git" - path: "Drivers/BSP/Components/lsm6dso" - name : "stm32-lps22hh" version: "v1.2.0" repository: From 88e88b8fe534e76ed440cdbdb2da8e2dd720ad20 Mon Sep 17 00:00:00 2001 From: Rahul Kar Date: Wed, 28 May 2025 06:18:43 +0000 Subject: [PATCH 11/17] Fix failing manifest verification --- .github/workflows/ci.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 5e0ca881f..9ad85f300 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -60,6 +60,8 @@ jobs: uses: FreeRTOS/CI-CD-GitHub-Actions/manifest-verifier@main with: path: ./ + exclude-submodules: | + Drivers/BSP/Components/lsm6dso fail-on-incorrect-version: true git-secrets: From ec1387c63196eacee229485ccd65853e2ff7b4fd Mon Sep 17 00:00:00 2001 From: Rahul Kar Date: Wed, 28 May 2025 06:29:16 +0000 Subject: [PATCH 12/17] Fix manifest failure --- .github/workflows/ci.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9ad85f300..e1ce959bd 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -60,8 +60,7 @@ jobs: uses: FreeRTOS/CI-CD-GitHub-Actions/manifest-verifier@main with: path: ./ - exclude-submodules: | - Drivers/BSP/Components/lsm6dso + exclude-submodules: Drivers/BSP/Components/lsm6dso fail-on-incorrect-version: true git-secrets: From f5046507de557aa49ad1083d3eae912a53f1452f Mon Sep 17 00:00:00 2001 From: Rahul Kar Date: Thu, 29 May 2025 05:05:09 +0000 Subject: [PATCH 13/17] Exclude not reachable links from link verifier --- .github/workflows/ci.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index e1ce959bd..97f6fdab2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -40,6 +40,9 @@ jobs: uses: actions/checkout@v3 - name: Link Verification uses: FreeRTOS/CI-CD-Github-Actions/link-verifier@main + with: + exclude-urls : 'https://www.st.com/en/development-tools/x-wifi-emw3080b.html' + exclude-dirs : Middleware/ARM/mcuboot/boot/espressif/hal/esp-idf/.gitlab/merge_request_templates verify-manifest: runs-on: ubuntu-latest From 6bb6a697c48a3630dea6a969e59b0b72e8cf0ec2 Mon Sep 17 00:00:00 2001 From: Rahul Kar Date: Thu, 29 May 2025 13:08:56 +0000 Subject: [PATCH 14/17] Update version in build yaml file --- .github/workflows/build.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index a393cd4b1..138a92b1e 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -35,7 +35,7 @@ jobs: PROJECT_PATH: ${{ github.workspace }}/Projects/${{ matrix.project }} steps: - name: Checkout Target Project - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: path: ${{ github.workspace }} - name: Checkout submodules @@ -87,7 +87,7 @@ jobs: mkdir -p artifacts rsync -avzh --ignore-missing-args Projects/${{ matrix.project }}/Debug/*.{hex,bin,elf,map,list,sh,ld} artifacts/ - name: Upload Build Artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: linux_${{ matrix.project }} path: | @@ -114,7 +114,7 @@ jobs: shell: bash run: git config --system core.longpaths true - name: Checkout Target Project - uses: actions/checkout@v2 + uses: actions/checkout@v4 with: path: ${{ github.workspace }} - name: Checkout submodules @@ -184,7 +184,7 @@ jobs: done - name: Upload Build Artifacts - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: name: windows_${{ matrix.project }} path: | From f5ed1dc03a264b9eeab999953eac601e6440b969 Mon Sep 17 00:00:00 2001 From: Gaurav Aggarwal Date: Mon, 2 Jun 2025 11:30:58 +0000 Subject: [PATCH 15/17] Attempt to fix link verifier Signed-off-by: Gaurav Aggarwal --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 97f6fdab2..d2f51a0df 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -41,8 +41,8 @@ jobs: - name: Link Verification uses: FreeRTOS/CI-CD-Github-Actions/link-verifier@main with: - exclude-urls : 'https://www.st.com/en/development-tools/x-wifi-emw3080b.html' - exclude-dirs : Middleware/ARM/mcuboot/boot/espressif/hal/esp-idf/.gitlab/merge_request_templates + exclude-urls: https://www.st.com/en/development-tools/x-wifi-emw3080b.html, https://www.gnu.org/software/complexity/manual/complexity.html + exclude-dirs: Middleware,Drivers verify-manifest: runs-on: ubuntu-latest From 7ae825be5969d5aa8be23413d8f18278686f8db6 Mon Sep 17 00:00:00 2001 From: Gaurav Aggarwal Date: Mon, 2 Jun 2025 11:43:28 +0000 Subject: [PATCH 16/17] Remove Link verifier check Signed-off-by: Gaurav Aggarwal --- .github/workflows/ci.yml | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d2f51a0df..687fb3878 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -33,17 +33,6 @@ jobs: - name: Run spellings check uses: FreeRTOS/CI-CD-Github-Actions/spellings@main - link-verifier: - runs-on: ubuntu-latest - steps: - - name: Clone This Repo - uses: actions/checkout@v3 - - name: Link Verification - uses: FreeRTOS/CI-CD-Github-Actions/link-verifier@main - with: - exclude-urls: https://www.st.com/en/development-tools/x-wifi-emw3080b.html, https://www.gnu.org/software/complexity/manual/complexity.html - exclude-dirs: Middleware,Drivers - verify-manifest: runs-on: ubuntu-latest steps: From 1f72dbde9ae50868d4a1aedeb83935b27cf58063 Mon Sep 17 00:00:00 2001 From: Gaurav Aggarwal Date: Thu, 5 Jun 2025 15:45:04 +0000 Subject: [PATCH 17/17] Specify output filename explicitly Signed-off-by: Gaurav Aggarwal --- .github/workflows/build.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 138a92b1e..4cac7a2fc 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -60,7 +60,7 @@ jobs: run: | mkdir -p ~/cache pushd $HOME - wget "${{ matrix.ide_pkg_url }}" -U "${{ matrix.user_agent }}" + wget -O "en.${IDE_PKG_NAME}.sh.zip" "${{ matrix.ide_pkg_url }}" -U "${{ matrix.user_agent }}" unzip en.${IDE_PKG_NAME}.sh.zip chmod +x ${IDE_PKG_NAME}.sh ./${IDE_PKG_NAME}.sh --tar -xf ./${IDE_PKG_NAME}.tar.gz @@ -155,7 +155,7 @@ jobs: export PATH="$(realpath ~/scoop)/shims:${PATH}" mkdir -p ~/cache pushd $HOME - wget "${{ matrix.ide_pkg_url }}" -U "${{ matrix.user_agent }}" + wget -O "en.${{ matrix.ide_pkg_name }}.exe.zip" "${{ matrix.ide_pkg_url }}" -U "${{ matrix.user_agent }}" 7z x en.${{ matrix.ide_pkg_name }}.exe.zip mv ${{ matrix.ide_pkg_name }}.exe ~/cache/${{ matrix.ide_pkg_name }}.exe popd