Преглед на файлове

Merge pull request #118 from dmitrystu/fix/ci_win

[CI] fix win build. switched to winwows-2019
Dmitry Filimonchuk преди 3 години
родител
ревизия
90e12ea03f
променени са 2 файла, в които са добавени 2 реда и са изтрити 2 реда
  1. 1 1
      .github/workflows/test-build-win.yml
  2. 1 1
      Makefile

+ 1 - 1
.github/workflows/test-build-win.yml

@@ -16,7 +16,7 @@ jobs:
     name: Windows
     env:
       CMSIS: CMSIS_5
-    runs-on: windows-latest
+    runs-on: windows-2019
     steps:
     - name: ARM GCC setup
       uses: fiam/arm-none-eabi-gcc@v1

+ 1 - 1
Makefile

@@ -40,7 +40,6 @@ vpath %.c $(SRCPATH)
 vpath %.S $(SRCPATH)
 vpath %.s $(SRCPATH)
 
-
 help all:
 	@echo 'Usage: make target [program]'
 	@echo 'Available targets are:'
@@ -109,6 +108,7 @@ $(DOUT).elf : $(OBJDIR) $(DOBJ) $(OBJECTS)
 	@$(LD) $(CFLAGS2) $(LDFLAGS) -Wl,--script='$(LDSCRIPT)' -Wl,-Map=$(DOUT).map $(DOBJ) $(OBJECTS) -o $@
 
 clean: $(OBJDIR)
+	$(MAKE) --version
 	@$(RM) $(DOUT).*
 	@$(RM) $(call fixpath, $(OBJDIR)/*.*)