From 01eebc700013e4f451f58e01143e8dacaedb1309 Mon Sep 17 00:00:00 2001 From: MrKevinWeiss Date: Fri, 12 Aug 2022 10:28:58 +0200 Subject: [PATCH] Makefile.include: remove CI-build: skipping link step This creates diff failures when calling info-modules and info-packages. Ideally info-modules and info-packages have clean output for the CI build --- Makefile.include | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Makefile.include b/Makefile.include index eb62097a50..d203281f84 100644 --- a/Makefile.include +++ b/Makefile.include @@ -484,11 +484,13 @@ endif # Check if programmer is supported by the board, only if PROGRAMMERS_SUPPORTED # is set and if programmer is not iotlab -ifneq (iotlab,$(PROGRAMMER)) - ifneq (,$(PROGRAMMERS_SUPPORTED)) - ifeq (,$(filter $(PROGRAMMER),$(PROGRAMMERS_SUPPORTED))) - $(info '$(PROGRAMMER)' programmer is not supported by this board. \ - Supported programmers: '$(PROGRAMMERS_SUPPORTED)') +ifneq ($(RIOT_CI_BUILD),1) + ifneq (iotlab,$(PROGRAMMER)) + ifneq (,$(PROGRAMMERS_SUPPORTED)) + ifeq (,$(filter $(PROGRAMMER),$(PROGRAMMERS_SUPPORTED))) + $(info '$(PROGRAMMER)' programmer is not supported by this board. \ + Supported programmers: '$(PROGRAMMERS_SUPPORTED)') + endif endif endif endif @@ -526,7 +528,6 @@ ifeq ($(RIOT_CI_BUILD),1) # set a dummy version number RIOT_VERSION_CODE ?= $(RIOT_VERSION_DUMMY_CODE) ifneq ($(filter $(BOARD_INSUFFICIENT_MEMORY), $(BOARD)),) - $(info CI-build: skipping link step) RIOTNOLINK:=1 endif # be more quiet when building for CI