Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Makefile helpers to ease moving untested boards (and move tested t420 and w530 boards) #1567

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -279,8 +279,8 @@ workflows:
- x230-hotp-maximized

- build:
name: UNTESTED_t420-hotp-maximized
target: UNTESTED_t420-hotp-maximized
name: t420-hotp-maximized
target: t420-hotp-maximized
subcommand: ""
requires:
- x230-hotp-maximized
Expand All @@ -293,8 +293,8 @@ workflows:
- x230-hotp-maximized

- build:
name: UNTESTED_t420-maximized
target: UNTESTED_t420-maximized
name: t420-maximized
target: t420-maximized
subcommand: ""
requires:
- x230-hotp-maximized
Expand Down Expand Up @@ -398,8 +398,8 @@ workflows:
- x230-hotp-maximized

- build:
name: UNTESTED_w530-hotp-maximized
target: UNTESTED_w530-hotp-maximized
name: w530-hotp-maximized
target: w530-hotp-maximized
subcommand: ""
requires:
- x230-hotp-maximized
Expand Down Expand Up @@ -440,8 +440,8 @@ workflows:
- x230-hotp-maximized

- build:
name: UNTESTED_w530-maximized
target: UNTESTED_w530-maximized
name: w530-maximized
target: w530-maximized
subcommand: ""
requires:
- x230-hotp-maximized
Expand Down
22 changes: 22 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -728,6 +728,28 @@ modules.clean:
rm -f "build/${CONFIG_TARGET_ARCH}/$$dir/.configured" ; \
done

board.move_untested_to_tested:
@echo "NEW_BOARD variable will remove UNTESTED_ prefix from $(BOARD)"
@NEW_BOARD=$$(echo $(BOARD) | sed 's/^UNTESTED_//'); \
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"; \
rm -rf boards/$$NEW_BOARD; \
mv boards/$$BOARD boards/$$NEW_BOARD; \
echo "Replacing $$BOARD with $$NEW_BOARD in .circleci/config.yml"; \
sed -i "s/$$BOARD/$$NEW_BOARD/g" .circleci/config.yml

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 "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"; \
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,
# since we can't reflash the firmware in qemu to update the keychain. Instead,
# inject the public key ahead of time. Specify the location of the key with
Expand Down