From f98eaf6bef593c9b7e2fe13d05b5bbf2f256e161 Mon Sep 17 00:00:00 2001 From: Franc Urbanc Date: Wed, 4 Mar 2026 14:57:31 +0100 Subject: [PATCH 1/2] CI: update build tests for various network setups --- .ci/Library.csolution.yml | 47 ++++++++++++++++++++++++++++ .ci/Network/Network.cproject.yml | 4 ++- .ci/Network/RTE/Network/Net_Config.h | 2 ++ .ci/Network/RTE/Network/Net_Debug.h | 2 ++ 4 files changed, 54 insertions(+), 1 deletion(-) diff --git a/.ci/Library.csolution.yml b/.ci/Library.csolution.yml index 8ad50258..8645f5f4 100644 --- a/.ci/Library.csolution.yml +++ b/.ci/Library.csolution.yml @@ -33,14 +33,61 @@ solution: define: - FS_DEBUG_EVR_ENABLE : 1 - NET_DEBUG_ENABLE : 1 + - NET_CORE_VARIANT : 1 + - NET_DEBUG_CHANNEL : 0 - USBD_DEBUG_EVR : 1 - USBH_DEBUG_EVR : 1 + - type: Debug_stdio + debug: on + optimize: debug + define: + - NET_CORE_VARIANT : 1 + - NET_DEBUG_ENABLE : 1 + - NET_DEBUG_CHANNEL : 2 + - type: Debug_ip4 + debug: on + optimize: debug + define: + - NET_CORE_VARIANT : 0 + - NET_DEBUG_ENABLE : 1 + - NET_DEBUG_CHANNEL : 0 + - type: Debug_ip4_stdio + debug: on + optimize: debug + define: + - NET_CORE_VARIANT : 0 + - NET_DEBUG_ENABLE : 1 + - NET_DEBUG_CHANNEL : 2 + - type: Release_ip4 + debug: off + optimize: balanced + define: + - NET_CORE_VARIANT : 0 + - NET_DEBUG_ENABLE : 0 - type: Release debug: off optimize: balanced + define: + - NET_CORE_VARIANT : 1 + - NET_DEBUG_ENABLE : 0 projects: - project: FileSystem/FileSystem.cproject.yml + not-for-context: + - .Debug_stdio + - .Debug_ip4 + - .Debug_ip4_stdio + - .Release_ip4 - project: Network/Network.cproject.yml - project: USB/Device/USB_Device.cproject.yml + not-for-context: + - .Debug_stdio + - .Debug_ip4 + - .Debug_ip4_stdio + - .Release_ip4 - project: USB/Host/USB_Host.cproject.yml + not-for-context: + - .Debug_stdio + - .Debug_ip4 + - .Debug_ip4_stdio + - .Release_ip4 diff --git a/.ci/Network/Network.cproject.yml b/.ci/Network/Network.cproject.yml index 8f086c99..bb164df8 100644 --- a/.ci/Network/Network.cproject.yml +++ b/.ci/Network/Network.cproject.yml @@ -10,7 +10,9 @@ project: components: - component: ARM::CMSIS:CORE - component: ARM::CMSIS-View:Event Recorder&DAP - for-context: .Debug + for-context: + - .Debug + - .Debug_ip4 - component: ARM::CMSIS Driver:Ethernet:Custom - component: ARM::CMSIS Driver:WiFi:Custom - component: ARM::CMSIS Driver:USART:Custom diff --git a/.ci/Network/RTE/Network/Net_Config.h b/.ci/Network/RTE/Network/Net_Config.h index bb3b5d93..12ccda0d 100644 --- a/.ci/Network/RTE/Network/Net_Config.h +++ b/.ci/Network/RTE/Network/Net_Config.h @@ -14,7 +14,9 @@ // Variant <0=>IPv4 only // <1=>IPv4/IPv6 dual stack // Configure variant of the network library +#ifndef NET_CORE_VARIANT #define NET_CORE_VARIANT 1 +#endif // Local Host Name // This is the name under which embedded host can be diff --git a/.ci/Network/RTE/Network/Net_Debug.h b/.ci/Network/RTE/Network/Net_Debug.h index 0033b4ef..f2a56078 100644 --- a/.ci/Network/RTE/Network/Net_Debug.h +++ b/.ci/Network/RTE/Network/Net_Debug.h @@ -20,7 +20,9 @@ // <1=>STDIO // <2=>STDIO + Timestamp // Select output channel for delivery of diagnostic messages +#ifndef NET_DEBUG_CHANNEL #define NET_DEBUG_CHANNEL 0 +#endif // System // Enable generation of system diagnostic messages From 3a4c0ef1d07aad0db3749a5ecb51d2f85e8aa990 Mon Sep 17 00:00:00 2001 From: Robert Rostohar Date: Thu, 5 Mar 2026 12:20:20 +0100 Subject: [PATCH 2/2] CI: simplify build-type defines and conditions --- .ci/Library.csolution.yml | 38 ++++++++------------------------ .ci/Network/Network.cproject.yml | 4 +--- 2 files changed, 10 insertions(+), 32 deletions(-) diff --git a/.ci/Library.csolution.yml b/.ci/Library.csolution.yml index 8645f5f4..3387f7a5 100644 --- a/.ci/Library.csolution.yml +++ b/.ci/Library.csolution.yml @@ -33,61 +33,41 @@ solution: define: - FS_DEBUG_EVR_ENABLE : 1 - NET_DEBUG_ENABLE : 1 - - NET_CORE_VARIANT : 1 - - NET_DEBUG_CHANNEL : 0 - USBD_DEBUG_EVR : 1 - USBH_DEBUG_EVR : 1 - - type: Debug_stdio + - type: Debug_net_stdio debug: on optimize: debug define: - - NET_CORE_VARIANT : 1 - NET_DEBUG_ENABLE : 1 - NET_DEBUG_CHANNEL : 2 - - type: Debug_ip4 + - type: Debug_net_ip4 debug: on optimize: debug define: - NET_CORE_VARIANT : 0 - NET_DEBUG_ENABLE : 1 - - NET_DEBUG_CHANNEL : 0 - - type: Debug_ip4_stdio + - type: Debug_net_ip4_stdio debug: on optimize: debug define: - NET_CORE_VARIANT : 0 - NET_DEBUG_ENABLE : 1 - NET_DEBUG_CHANNEL : 2 - - type: Release_ip4 + - type: Release debug: off optimize: balanced - define: - - NET_CORE_VARIANT : 0 - - NET_DEBUG_ENABLE : 0 - - type: Release + - type: Release_net_ip4 debug: off optimize: balanced define: - - NET_CORE_VARIANT : 1 - - NET_DEBUG_ENABLE : 0 + - NET_CORE_VARIANT : 0 projects: - project: FileSystem/FileSystem.cproject.yml - not-for-context: - - .Debug_stdio - - .Debug_ip4 - - .Debug_ip4_stdio - - .Release_ip4 + not-for-context: \.*_net_.* - project: Network/Network.cproject.yml - project: USB/Device/USB_Device.cproject.yml - not-for-context: - - .Debug_stdio - - .Debug_ip4 - - .Debug_ip4_stdio - - .Release_ip4 + not-for-context: \.*_net_.* - project: USB/Host/USB_Host.cproject.yml - not-for-context: - - .Debug_stdio - - .Debug_ip4 - - .Debug_ip4_stdio - - .Release_ip4 + not-for-context: \.*_net_.* diff --git a/.ci/Network/Network.cproject.yml b/.ci/Network/Network.cproject.yml index bb164df8..34c249e3 100644 --- a/.ci/Network/Network.cproject.yml +++ b/.ci/Network/Network.cproject.yml @@ -10,9 +10,7 @@ project: components: - component: ARM::CMSIS:CORE - component: ARM::CMSIS-View:Event Recorder&DAP - for-context: - - .Debug - - .Debug_ip4 + for-context: \.*(?=Debug)(?!.*stdio).* - component: ARM::CMSIS Driver:Ethernet:Custom - component: ARM::CMSIS Driver:WiFi:Custom - component: ARM::CMSIS Driver:USART:Custom