diff options
| author | hathach <[email protected]> | 2023-03-05 13:39:38 +0700 |
|---|---|---|
| committer | hathach <[email protected]> | 2023-03-05 13:39:38 +0700 |
| commit | 8a493485e802673a877e43a53c7181a9668c7d51 (patch) | |
| tree | 8982de3017be17bcb799af5d4b33d5bfaa4a43f1 | |
| parent | b4ef98cbdcac8a6bec4caee05920afc37a745149 (diff) | |
more ci test
| -rw-r--r-- | .github/workflows/build_win_mac.yml | 2 | ||||
| -rw-r--r-- | examples/make.mk | 3 | ||||
| -rw-r--r-- | examples/rules.mk | 4 |
3 files changed, 6 insertions, 3 deletions
diff --git a/.github/workflows/build_win_mac.yml b/.github/workflows/build_win_mac.yml index c2e961f23..6d4f8ff80 100644 --- a/.github/workflows/build_win_mac.yml +++ b/.github/workflows/build_win_mac.yml @@ -44,7 +44,7 @@ jobs: - name: Install ARM GCC uses: carlosperate/arm-none-eabi-gcc-action@v1 with: - release: '12.2.Rel1' + release: '10.3-2021.10' - name: Checkout TinyUSB uses: actions/checkout@v3 diff --git a/examples/make.mk b/examples/make.mk index 5b364baf7..8a0b6db6b 100644 --- a/examples/make.mk +++ b/examples/make.mk @@ -77,10 +77,9 @@ endif ifeq ($(CMDEXE),1) CP = copy RM = del + MKDIR = mkdir PYTHON = python - MKDIR = cmd /e /c mkdir else - SED = sed CP = cp RM = rm MKDIR = mkdir diff --git a/examples/rules.mk b/examples/rules.mk index dcef934ab..06bc593ba 100644 --- a/examples/rules.mk +++ b/examples/rules.mk @@ -265,7 +265,11 @@ debug-bmp: $(BUILD)/$(PROJECT).elf # Create binary directory $(BIN): +ifeq ($(CMDEXE),1) + @$(MKDIR) $(subst /,\,$@) +else @$(MKDIR) -p $@ +endif # Copy binaries .elf, .bin, .hex, .uf2 to BIN for upload # due to large size of combined artifacts, only uf2 is uploaded for now |