Skip to content

Commit

Permalink
fixed CI
Browse files Browse the repository at this point in the history
  • Loading branch information
tridge committed Aug 20, 2024
1 parent 3de7d53 commit 293b499
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/CI_build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ jobs:

steps:
- uses: actions/checkout@v4
with:
submodules: 'recursive'

- name: Build CI
run: |
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/CI_build_macos.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ jobs:

steps:
- uses: actions/checkout@v4
with:
submodules: 'recursive'

- name: Build CI
run: |
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/CI_build_windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,6 @@ jobs:

steps:
- uses: actions/checkout@v4
with:
submodules: 'recursive'

- name: Build CI
run: |
Expand Down
14 changes: 10 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -65,10 +65,13 @@ all : check_tools bootloaders

# Check if tools are installed
check_tools:
@if [ ! -f $(CC) ]; then \
echo "Error: please install tools first."; \
exit 1; \
fi
ifeq ($(OS),Windows_NT)
@if not exist "$(CC).exe" ( \
echo Error: please install tools first with target arm_sdk_install. & exit /B 1 \
)
else
@$(SHELL) -c 'command -v $(CC) >/dev/null 2>&1 || { echo "Error: please install tools first with target arm_sdk_install."; exit 1; }'
endif

clean :
@echo Removing $(OBJ) directory
Expand Down Expand Up @@ -142,6 +145,9 @@ $(foreach BUILD,$(MCU_BUILDS),$(foreach PIN,$(BOOTLOADER_PINS),$(eval $(call CRE

bootloaders: $(ALL_BUILDS)

# include the targets for installing tools
include $(ROOT)/make/tools_install.mk

# useful target to list all of the board targets so you can see what
# make target to use for your board
targets:
Expand Down

0 comments on commit 293b499

Please sign in to comment.