From 08597ac7c61d3d22e629772054e77e7f994acd38 Mon Sep 17 00:00:00 2001
From: Filip Matusiak <filip.matusiak@iopsys.eu>
Date: Tue, 22 Apr 2025 11:30:38 +0200
Subject: [PATCH] CI: step up code-analysis to version 1.2
---
.gitlab-ci.yml | 10 +++++-----
gitlab-ci/install-dependencies.sh | 2 +-
src/Makefile | 10 ++++++++++
3 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3ef38b8f9..4ad1e266a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,22 +1,22 @@
include:
- project: 'iopsys/gitlab-ci-pipeline'
file: '/static-code-analysis.yml'
- ref: '0.31'
+ ref: '1.2'
stages:
- static_code_analysis
- compile_test
variables:
+ COMMON_IMAGE: "dev.iopsys.eu:5050/iopsys/gitlab-ci-pipeline/code-analysis:1.2"
DEBUG: 'TRUE'
- SOURCE_FOLDER: "."
- CPD_OPTIONS: " --minimum-tokens 500 --language c --exclude ./test/cmocka --files"
- RUN_CPPCHECK: "cppcheck --enable=all --error-exitcode=1 --check-config --force --suppress=missingIncludeSystem ."
+ SOURCE_FOLDER: "src"
+ CPD_OPTIONS: " --minimum-tokens 500"
CPPCHECK_OPTIONS: " --enable=all --error-exitcode=1 --check-config --force --suppress=missingIncludeSystem --suppress=ConfigurationNotChecked"
run_compile_test:
stage: compile_test
- image: dev.iopsys.eu:5050/iopsys/gitlab-ci-pipeline/code-analysis:0.31
+ image: ${COMMON_IMAGE}
allow_failure: false
script:
- "./gitlab-ci/install-dependencies.sh"
diff --git a/gitlab-ci/install-dependencies.sh b/gitlab-ci/install-dependencies.sh
index 4668b83c6..73732ec5d 100755
--- a/gitlab-ci/install-dependencies.sh
+++ b/gitlab-ci/install-dependencies.sh
@@ -65,7 +65,7 @@ cd ieee1905
exec_cmd ./gitlab-ci/install-dependencies.sh
exec_cmd ./gitlab-ci/setup.sh
cd src
-CFLAGS+="-DHAS_WIFI -DDYNAMIC_CNTLR_SYNC_CONFIG -DHAS_UBUS -DEXTENSION_ALLOWED" make
+CFLAGS+="-DHAS_WIFI -DDYNAMIC_CNTLR_SYNC_CONFIG -DHAS_UBUS -DEXTENSION_ALLOWED -DEASYMESH_VERSION=6" make
mkdir -p /usr/include /usr/lib/ieee1905
exec_cmd cp -a cmdu.h /usr/include/
exec_cmd cp -a cmdu_ackq.h /usr/include/
diff --git a/src/Makefile b/src/Makefile
index a027ddf1e..53f2353be 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -6,6 +6,16 @@ CFLAGS += -I/usr/include/libnl3
CFLAGS += -DVENDOR_EXTENSION
+ifeq (,$(findstring EASYMESH_VERSION,$(CFLAGS)))
+$(info EASYMESH_VERSION is not set. Build for 6)
+EASYMESH_VERSION=6
+CFLAGS+=-DEASYMESH_VERSION=6
+else
+EASYMESH_VERSION=$(patsubst -DEASYMESH_VERSION=%,%,$(filter -DEASYMESH_VERSION=%,$(CFLAGS)))
+$(info EASYMESH_VERSION passed is $(EASYMESH_VERSION))
+endif
+
+
OBJS = \
utils/debug.o \
utils/liblist.o \
--
GitLab