Be explicit about python version to fix ESP8266 build issues

This commit is contained in:
Gordon Williams 2022-03-02 14:23:50 +00:00
parent 7249975f3c
commit f3dd834698
2 changed files with 4 additions and 4 deletions

View File

@ -1,4 +1,4 @@
name: C/C++ CI
name: Firmware build
on:
push:
@ -14,7 +14,7 @@ jobs:
strategy:
# devices to build for
matrix:
board: [LINUX, ESP32, ESP8266_BOARD, ESP8266_4MB, MICROBIT, MICROBIT2]
board: [LINUX, ESP32, ESP8266_BOARD, ESP8266_4MB, MICROBIT1, MICROBIT2]
# try and build for all devices even if one fails
fail-fast: false
steps:

View File

@ -83,7 +83,7 @@ $(USER1_BIN): $(USER1_ELF)
$(Q)$(OBJCOPY) --only-section .rodata -O binary $(USER1_ELF) eagle.app.v6.rodata.bin
$(Q)$(OBJCOPY) --only-section .irom0.text -O binary $(USER1_ELF) eagle.app.v6.irom0text.bin
@ls -ls eagle*bin
$(Q)COMPILE=gcc python $(APPGEN_TOOL) $(USER1_ELF) 2 $(ESP_FLASH_MODE) $(ESP_FLASH_FREQ_DIV) $(ESP_FLASH_SIZE) 0 >/dev/null
$(Q)COMPILE=gcc python2 $(APPGEN_TOOL) $(USER1_ELF) 2 $(ESP_FLASH_MODE) $(ESP_FLASH_FREQ_DIV) $(ESP_FLASH_SIZE) 0 >/dev/null
$(Q) rm -f eagle.app.v6.*.bin
$(Q) mv eagle.app.flash.bin $@
@echo "** user1.bin uses $$( stat $(STAT_FLAGS) $@) bytes of" $(ESP_FLASH_MAX) "available"
@ -97,7 +97,7 @@ $(USER2_BIN): $(USER2_ELF) $(USER1_BIN)
$(Q)$(OBJCOPY) --only-section .data -O binary $(USER2_ELF) eagle.app.v6.data.bin
$(Q)$(OBJCOPY) --only-section .rodata -O binary $(USER2_ELF) eagle.app.v6.rodata.bin
$(Q)$(OBJCOPY) --only-section .irom0.text -O binary $(USER2_ELF) eagle.app.v6.irom0text.bin
$(Q)COMPILE=gcc python $(APPGEN_TOOL) $(USER2_ELF) 2 $(ESP_FLASH_MODE) $(ESP_FLASH_FREQ_DIV) $(ESP_FLASH_SIZE) 1 >/dev/null
$(Q)COMPILE=gcc python2 $(APPGEN_TOOL) $(USER2_ELF) 2 $(ESP_FLASH_MODE) $(ESP_FLASH_FREQ_DIV) $(ESP_FLASH_SIZE) 1 >/dev/null
$(Q) rm -f eagle.app.v6.*.bin
$(Q) mv eagle.app.flash.bin $@