Haswell boards : renamed to UNTESTED_* while still built by CircleCI per new policy (not blocking tested boards from being merged and downloaded without risks of possible bricks, leading UNTESTED_ boards untested until reported tested in seperate issue and ideally a PR from board testers).

Fix Haswell board HOTP variants wrongly sourcing old non-hotp variants paths through Makefile inclusion. Fixing Makefile helper

Signed-off-by: Thierry Laurion <insurgo@riseup.net>

.circleci/config.yml

@@ -432,29 +432,29 @@ workflows:
 
 
       - build:
-          name: t440p-maximized
-          target: t440p-maximized
+          name: UNTESTED_t440p-maximized
+          target: UNTESTED_t440p-maximized
           subcommand: ""
           requires:
             - x230-hotp-maximized
 
       - build:
-          name: t440p-hotp-maximized
-          target: t440p-hotp-maximized
+          name: UNTESTED_t440p-hotp-maximized
+          target: UNTESTED_t440p-hotp-maximized
           subcommand: ""
           requires:
             - x230-hotp-maximized
 
       - build:
-          name: w541-maximized
-          target: w541-maximized
+          name: UNTESTED_w541-maximized
+          target: UNTESTED_w541-maximized
           subcommand: ""
           requires:
             - x230-hotp-maximized
 
       - build:
-          name: w541-hotp-maximized
-          target: w541-hotp-maximized
+          name: UNTESTED_w541-hotp-maximized
+          target: UNTESTED_w541-hotp-maximized
           subcommand: ""
           requires:
             - x230-hotp-maximized

Makefile

@@ -794,6 +794,8 @@ modules.clean:
 board.move_untested_to_tested:
 	@echo "NEW_BOARD variable will remove UNTESTED_ prefix from $(BOARD)"
 	@NEW_BOARD=$$(echo $(BOARD) | sed 's/^UNTESTED_//'); \
+	echo "changing $(BOARD) name under boards/$(BOARD)/$(BOARD).config to $${NEW_BOARD}"; \
+	sed boards/$(BOARD)/$(BOARD).config 's/$(BOARD)/$${NEW_BOARD}/g'; \
 	echo "Renaming boards/$$BOARD/$$BOARD.config to boards/$$BOARD/$$NEW_BOARD.config"; \
 	mv boards/$$BOARD/$$BOARD.config boards/$$BOARD/$$NEW_BOARD.config; \
 	echo "Renaming boards/$$BOARD to boards/$$NEW_BOARD"; \
@@ -831,11 +833,13 @@ board.move_tested_to_untested:
 	@echo "NEW_BOARD variable will add UNTESTED_ prefix to $(BOARD)"
 	@NEW_BOARD=UNTESTED_$(BOARD); \
 	rm -rf boards/$${NEW_BOARD}; \
+	echo "changing $(BOARD) name under boards/$(BOARD)/$(BOARD).config to $${NEW_BOARD}"; \
+	sed boards/$(BOARD)/$(BOARD).config 's/$(BOARD)/$${NEW_BOARD}/g'; \
 	echo "Renaming boards/$(BOARD)/$(BOARD).config to boards/$(BOARD)/$${NEW_BOARD}.config"; \
 	mv boards/$(BOARD)/$(BOARD).config boards/$(BOARD)/$${NEW_BOARD}.config; \
 	echo "Renaming boards/$(BOARD) to boards/$${NEW_BOARD}"; \
 	mv boards/$(BOARD) boards/$${NEW_BOARD}; \
-	echo "Replacing $(BOARD) with $${NEW_BOARD} in .circleci/config.yml"; \
+	echo "Replacing $(BOARD) with $${NEW_BOARD} in .circleci/config.yml"; \
 	sed -i "s/$(BOARD)/$${NEW_BOARD}/g" .circleci/config.yml
 
 # Inject a GPG key into the image - this is most useful when testing in qemu,

boards/UNTESTED_t440p-hotp-maximized/UNTESTED_t440p-hotp-maximized.config

@@ -1,5 +1,5 @@
 # Inherit the rest from the base T440p config.
-include $(pwd)/boards/t440p-maximized/t440p-maximized.config
+include $(pwd)/boards/UNTESTED_t440p-maximized/UNTESTED_t440p-maximized.config
 
 CONFIG_HOTPKEY=y
 export CONFIG_AUTO_BOOT_TIMEOUT=5

boards/UNTESTED_w541-hotp-maximized/UNTESTED_w541-hotp-maximized.config

@@ -1,5 +1,5 @@
 # Inherit the rest from the base W541 config.
-include $(pwd)/boards/w541-maximized/w541-maximized.config
+include $(pwd)/boards/UNTESTED_w541-maximized/UNTESTED_w541-maximized.config
 
 CONFIG_HOTPKEY=y
 export CONFIG_AUTO_BOOT_TIMEOUT=5