RIOT-OS/RIOT
RIOT-OS/RIOT
1
0
Fork 0
mirror of https://github.com/RIOT-OS/RIOT.git synced 2024-12-29 04:50:03 +01:00
Code Releases Activity

Makefile.include: remove CI-build: skipping link step

Browse Source 
This creates diff failures when calling info-modules and info-packages.
Ideally info-modules and info-packages have clean output for the CI build
This commit is contained in:
MrKevinWeiss 2022-08-12 10:28:58 +02:00
parent 606402e848
commit 01eebc7000
No known key found for this signature in database
GPG Key ID: 4B69974722CBEEAE
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Makefile.include
View File

@ -484,11 +484,13 @@ endif
# Check if programmer is supported by the board, only if PROGRAMMERS_SUPPORTED # Check if programmer is supported by the board, only if PROGRAMMERS_SUPPORTED
# is set and if programmer is not iotlab # is set and if programmer is not iotlab
ifneq (iotlab,$(PROGRAMMER)) ifneq ($(RIOT_CI_BUILD),1)
ifneq (,$(PROGRAMMERS_SUPPORTED)) ifneq (iotlab,$(PROGRAMMER))
ifeq (,$(filter $(PROGRAMMER),$(PROGRAMMERS_SUPPORTED))) ifneq (,$(PROGRAMMERS_SUPPORTED))
$(info '$(PROGRAMMER)' programmer is not supported by this board. \ ifeq (,$(filter $(PROGRAMMER),$(PROGRAMMERS_SUPPORTED)))
Supported programmers: '$(PROGRAMMERS_SUPPORTED)') $(info '$(PROGRAMMER)' programmer is not supported by this board. \
Supported programmers: '$(PROGRAMMERS_SUPPORTED)')
endif
endif endif
endif endif
endif endif
@ -526,7 +528,6 @@ ifeq ($(RIOT_CI_BUILD),1)
# set a dummy version number # set a dummy version number
RIOT_VERSION_CODE ?= $(RIOT_VERSION_DUMMY_CODE) RIOT_VERSION_CODE ?= $(RIOT_VERSION_DUMMY_CODE)
ifneq ($(filter $(BOARD_INSUFFICIENT_MEMORY), $(BOARD)),) ifneq ($(filter $(BOARD_INSUFFICIENT_MEMORY), $(BOARD)),)
$(info CI-build: skipping link step)
RIOTNOLINK:=1 RIOTNOLINK:=1
endif endif
# be more quiet when building for CI # be more quiet when building for CI