Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-13 11:29:58 +03:00
Code Issues Wiki Activity

Reduced the number of target groups to build in CI from 6 to 3.

Browse source
This commit is contained in:
mikeller 2020-02-18 00:42:08 +13:00
parent 6bb7dbbba9
commit f6dcc09f65
3 changed files with 3 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

3
.travis.yml
View file

@ -19,9 +19,6 @@ env:
- GOAL=test-all - GOAL=test-all
- GOAL=targets-group-1 - GOAL=targets-group-1
- GOAL=targets-group-2 - GOAL=targets-group-2
- GOAL=targets-group-3
- GOAL=targets-group-4
- GOAL=targets-group-5
- GOAL=targets-group-rest - GOAL=targets-group-rest
# - GOAL=all # - GOAL=all
# - GOAL=AFROMINI # - GOAL=AFROMINI

17
Makefile
View file

@ -478,16 +478,7 @@ targets-group-1: $(GROUP_1_TARGETS)
## targets-group-2 : build some targets ## targets-group-2 : build some targets
targets-group-2: $(GROUP_2_TARGETS) targets-group-2: $(GROUP_2_TARGETS)
## targets-group-3 : build some targets ## targets-group-rest: build the rest of the targets (not listed in the other groups)
targets-group-3: $(GROUP_3_TARGETS)
## targets-group-4 : build some targets
targets-group-4: $(GROUP_4_TARGETS)
## targets-group-5 : build some targets
targets-group-5: $(GROUP_5_TARGETS)
## targets-group-rest: build the rest of the targets (not listed in group 1, 2 or 3)
targets-group-rest: $(GROUP_OTHER_TARGETS) targets-group-rest: $(GROUP_OTHER_TARGETS)
$(VALID_TARGETS): $(VALID_TARGETS):
@ -631,16 +622,10 @@ targets:
@echo "Base target: $(BASE_TARGET)" @echo "Base target: $(BASE_TARGET)"
@echo "targets-group-1: $(GROUP_1_TARGETS)" @echo "targets-group-1: $(GROUP_1_TARGETS)"
@echo "targets-group-2: $(GROUP_2_TARGETS)" @echo "targets-group-2: $(GROUP_2_TARGETS)"
@echo "targets-group-3: $(GROUP_3_TARGETS)"
@echo "targets-group-4: $(GROUP_4_TARGETS)"
@echo "targets-group-5: $(GROUP_5_TARGETS)"
@echo "targets-group-rest: $(GROUP_OTHER_TARGETS)" @echo "targets-group-rest: $(GROUP_OTHER_TARGETS)"
@echo "targets-group-1: $(words $(GROUP_1_TARGETS)) targets" @echo "targets-group-1: $(words $(GROUP_1_TARGETS)) targets"
@echo "targets-group-2: $(words $(GROUP_2_TARGETS)) targets" @echo "targets-group-2: $(words $(GROUP_2_TARGETS)) targets"
@echo "targets-group-3: $(words $(GROUP_3_TARGETS)) targets"
@echo "targets-group-4: $(words $(GROUP_4_TARGETS)) targets"
@echo "targets-group-5: $(words $(GROUP_5_TARGETS)) targets"
@echo "targets-group-rest: $(words $(GROUP_OTHER_TARGETS)) targets" @echo "targets-group-rest: $(words $(GROUP_OTHER_TARGETS)) targets"
@echo "total in all groups $(words $(CI_TARGETS)) targets" @echo "total in all groups $(words $(CI_TARGETS)) targets"

16
make/targets_list.mk
View file

@ -170,7 +170,7 @@ LEGACY_TARGETS := MATEKF405 \
CI_TARGETS := $(filter-out $(LEGACY_TARGETS) $(UNSUPPORTED_TARGETS), $(VALID_TARGETS)) CI_TARGETS := $(filter-out $(LEGACY_TARGETS) $(UNSUPPORTED_TARGETS), $(VALID_TARGETS))
TARGETS_TOTAL := $(words $(CI_TARGETS)) TARGETS_TOTAL := $(words $(CI_TARGETS))
TARGET_GROUPS := 6 TARGET_GROUPS := 3
TARGETS_PER_GROUP := $(shell expr $(TARGETS_TOTAL) / $(TARGET_GROUPS) ) TARGETS_PER_GROUP := $(shell expr $(TARGETS_TOTAL) / $(TARGET_GROUPS) )
ST := 1 ST := 1
@ -181,16 +181,4 @@ ST := $(shell expr $(ET) + 1)
ET := $(shell expr $(ST) + $(TARGETS_PER_GROUP)) ET := $(shell expr $(ST) + $(TARGETS_PER_GROUP))
GROUP_2_TARGETS := $(wordlist $(ST), $(ET), $(CI_TARGETS)) GROUP_2_TARGETS := $(wordlist $(ST), $(ET), $(CI_TARGETS))
ST := $(shell expr $(ET) + 1) GROUP_OTHER_TARGETS := $(filter-out $(GROUP_1_TARGETS) $(GROUP_2_TARGETS), $(CI_TARGETS))
ET := $(shell expr $(ST) + $(TARGETS_PER_GROUP))
GROUP_3_TARGETS := $(wordlist $(ST), $(ET), $(CI_TARGETS))
ST := $(shell expr $(ET) + 1)
ET := $(shell expr $(ST) + $(TARGETS_PER_GROUP))
GROUP_4_TARGETS := $(wordlist $(ST), $(ET), $(CI_TARGETS))
ST := $(shell expr $(ET) + 1)
ET := $(shell expr $(ST) + $(TARGETS_PER_GROUP))
GROUP_5_TARGETS := $(wordlist $(ST), $(ET), $(CI_TARGETS))
GROUP_OTHER_TARGETS := $(filter-out $(GROUP_1_TARGETS) $(GROUP_2_TARGETS) $(GROUP_3_TARGETS) $(GROUP_4_TARGETS) $(GROUP_5_TARGETS), $(CI_TARGETS))