diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 3b3a977..46e8959 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,13 +1,13 @@ variables: - PRODUCT_NAME: "AG" +# PRODUCT_NAME: "AG" # PRODUCT_VARIANT: "NA" - PRODUCT_VARIANT: "EU" +# PRODUCT_VARIANT: "EU" # PRODUCT_VARIANT: "CN" - PROJECT_VERSION: "10" - SW_MAJOR: "1" - SW_MINOR: "3" +# PROJECT_VERSION: "10" +# SW_MAJOR: "1" +# SW_MINOR: "3" before_script: @@ -15,26 +15,26 @@ before_script: - "echo $CI_BUILD_REF_NAME" stages: + - check - build -# - check # - test # - deploy build_job: script: - "cd source" - - "make APP=test BOARD=stm32f4-discovery" - - "make APP=example_semaphore BOARD=stm32f4-discovery" + - "make build APP=test BOARD=stm32f4-discovery" + - "make build APP=example_semaphore BOARD=stm32f4-discovery" stage: build except: - /^release/.*$/ -#check_job: -# script: -# - "cd top_agricola/core" -# - "./generate_cpp_ci_makefile.py" -# - "make -f Makefile_ci.cck all" -# stage: check +check_job: + script: + - "cd source" + - "make check APP=test BOARD=stm32f4-discovery" + - "make check APP=example_semaphore BOARD=stm32f4-discovery" + stage: check #test_job: # script: "echo test stage" diff --git a/source/Makefile b/source/Makefile index 9e7ff9c..dacbd36 100755 --- a/source/Makefile +++ b/source/Makefile @@ -30,6 +30,8 @@ ASMSOURCES += $(foreach folder, $(SUB_FOLDER), $(wildcard $(SRC_DIR)/$(folder)/* all: check $(MAINFILE) +build: $(MAINFILE) + check: $(CPPCHECK) $(CPPCHECK_FLAGS) $(CHECKSOURCES)