Skip to content

Commit ab52f0e

Browse files
authored
Fix rolling build (#18)
* Ignore ament_cmake_ros/rmw_test_fixture_implementation Signed-off-by: Antón Casas <antoncasas@eprosima.com> * Fix warnings about comparison always true, since statically allocated array could never be equal to NULL. Signed-off-by: Antón Casas <antoncasas@eprosima.com> * Bump Ubuntu in rolling CI Signed-off-by: Antón Casas <antoncasas@eprosima.com> --------- Signed-off-by: Antón Casas <antoncasas@eprosima.com>
1 parent f83776e commit ab52f0e

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-5
lines changed

.github/workflows/ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ jobs:
1515

1616
micro_ros_azure_app:
1717
runs-on: ubuntu-latest
18-
container: ubuntu:20.04
18+
container: ubuntu:24.04
1919
strategy:
2020
matrix:
2121
azure_rtos_version: [v6.1.7_rel]
@@ -27,7 +27,7 @@ jobs:
2727
apt update
2828
export DEBIAN_FRONTEND=noninteractive
2929
apt install -y --no-install-recommends git build-essential gcc-arm-none-eabi python3-pip cmake ninja-build libnewlib-arm-none-eabi libstdc++-arm-none-eabi-newlib g++-multilib gcc-multilib binutils-arm-none-eabi
30-
pip3 install catkin_pkg lark-parser colcon-common-extensions
30+
pip3 install catkin_pkg lark-parser colcon-common-extensions --break-system-packages
3131
- uses: actions/checkout@v2
3232
with:
3333
path: repo

lib/netx_driver/inventek/wifi.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -572,7 +572,7 @@ WIFI_Status_t WIFI_GetModuleFwRevision(char *rev)
572572
{
573573
WIFI_Status_t ret = WIFI_STATUS_ERROR;
574574

575-
if(EsWifiObj.FW_Rev != NULL)
575+
if(EsWifiObj.FW_Rev[0] != '\0')
576576
{
577577
strncpy(rev, (char *)EsWifiObj.FW_Rev, ES_WIFI_FW_REV_SIZE);
578578
ret = WIFI_STATUS_OK;
@@ -589,7 +589,7 @@ WIFI_Status_t WIFI_GetModuleID(char *Id)
589589
{
590590
WIFI_Status_t ret = WIFI_STATUS_ERROR;
591591

592-
if(EsWifiObj.Product_ID != NULL)
592+
if(EsWifiObj.Product_ID[0] != '\0')
593593
{
594594
strncpy(Id, (char *)EsWifiObj.Product_ID, ES_WIFI_PRODUCT_ID_SIZE);
595595
ret = WIFI_STATUS_OK;
@@ -606,7 +606,7 @@ WIFI_Status_t WIFI_GetModuleName(char *ModuleName)
606606
{
607607
WIFI_Status_t ret = WIFI_STATUS_ERROR;
608608

609-
if(EsWifiObj.Product_Name != NULL)
609+
if(EsWifiObj.Product_Name[0] != '\0')
610610
{
611611
strncpy(ModuleName, (char *)EsWifiObj.Product_Name, ES_WIFI_PRODUCT_NAME_SIZE);
612612
ret = WIFI_STATUS_OK;

microros/libmicroros.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ $(EXTENSIONS_DIR)/micro_ros_dev/install:
4343
git clone -b rolling https://github.com/ament/googletest src/googletest; \
4444
git clone -b rolling https://github.com/ros2/ament_cmake_ros src/ament_cmake_ros; \
4545
git clone -b rolling https://github.com/ament/ament_index src/ament_index; \
46+
touch src/ament_cmake_ros/rmw_test_fixture_implementation/COLCON_IGNORE; \
4647
colcon build --cmake-args -DBUILD_TESTING=OFF -DCMAKE_C_COMPILER=gcc -DCMAKE_CXX_COMPILER=gcc;
4748

4849
$(EXTENSIONS_DIR)/micro_ros_src/src:

0 commit comments

Comments
 (0)