Merge branch 'master-cmake' of https://github.com/sle118/squeezelite-esp32 into master-cmake

This commit is contained in:
Philippe G
2021-01-08 15:05:52 -08:00
4 changed files with 11 additions and 7 deletions

View File

@@ -80,7 +80,7 @@ jobs:
run: | run: |
env | grep "artifact\|tag\|GITHUB\|version\|NUMBER\|TARGET" >${TARGET_BUILD_NAME}-env.txt env | grep "artifact\|tag\|GITHUB\|version\|NUMBER\|TARGET" >${TARGET_BUILD_NAME}-env.txt
echo "${tag}" >version.txt echo "${tag}" >version.txt
docker run --env-file=${TARGET_BUILD_NAME}-env.txt --rm -v $PWD:/project -w /project sle118/squeezelite-esp32:release-v4.0 /bin/bash -c "cp build-scripts/${TARGET_BUILD_NAME}-sdkconfig.defaults sdkconfig && idf.py build && zip build/${artifact_file_name} partitions*.csv build/*.bin build/bootloader/bootloader.bin build/partition_table/partition-table.bin build/flash_project_args build/size_*.txt" docker run --env-file=${TARGET_BUILD_NAME}-env.txt --rm -v $PWD:/project -w /project sle118/squeezelite-esp32:release-v4.0 /bin/bash -c "cp build-scripts/${TARGET_BUILD_NAME}-sdkconfig.defaults sdkconfig && idf.py build && zip -r build_output.zip build && zip build/${artifact_file_name} partitions*.csv build/*.bin build/bootloader/bootloader.bin build/partition_table/partition-table.bin build/flash_project_args build/size_*.txt"
# - name: Build Mock firmware # - name: Build Mock firmware
# run: | # run: |
# mkdir -p build # mkdir -p build
@@ -106,6 +106,7 @@ jobs:
build/size_comp1.txt build/size_comp1.txt
build/size_comp2.txt build/size_comp2.txt
partitions.csv partitions.csv
build_output.zip
- uses: actions/upload-artifact@v2 - uses: actions/upload-artifact@v2
with: with:
name: ${{ env.artifact_bin_file_name }} name: ${{ env.artifact_bin_file_name }}

View File

@@ -625,8 +625,9 @@ CONFIG_LWIP_MAX_SOCKETS=16
# CONFIG_LWIP_USE_ONLY_LWIP_SELECT is not set # CONFIG_LWIP_USE_ONLY_LWIP_SELECT is not set
CONFIG_LWIP_SO_REUSE=y CONFIG_LWIP_SO_REUSE=y
CONFIG_LWIP_SO_REUSE_RXTOALL=y CONFIG_LWIP_SO_REUSE_RXTOALL=y
CONFIG_LWIP_IP4_REASSEMBLY=y #CONFIG_LWIP_IP_REASSEMBLY is not set
CONFIG_LWIP_IP6_REASSEMBLY=y CONFIG_LWIP_IP6_REASSEMBLY=Y
CONFIG_LWIP_IP4_REASSEMBLY=Y
CONFIG_LWIP_ESP_GRATUITOUS_ARP=y CONFIG_LWIP_ESP_GRATUITOUS_ARP=y
CONFIG_LWIP_GARP_TMR_INTERVAL=60 CONFIG_LWIP_GARP_TMR_INTERVAL=60
CONFIG_LWIP_TCPIP_RECVMBOX_SIZE=32 CONFIG_LWIP_TCPIP_RECVMBOX_SIZE=32

View File

@@ -459,8 +459,9 @@ CONFIG_LWIP_SO_REUSE_RXTOALL=y
# CONFIG_LWIP_IP_FRAG is not set # CONFIG_LWIP_IP_FRAG is not set
# CONFIG_LWIP_STATS is not set # CONFIG_LWIP_STATS is not set
# CONFIG_LWIP_ETHARP_TRUST_IP_MAC is not set # CONFIG_LWIP_ETHARP_TRUST_IP_MAC is not set
CONFIG_LWIP_IP4_REASSEMBLY=y #CONFIG_LWIP_IP_REASSEMBLY is not set
CONFIG_LWIP_IP6_REASSEMBLY=y CONFIG_LWIP_IP6_REASSEMBLY=Y
CONFIG_LWIP_IP4_REASSEMBLY=Y
CONFIG_LWIP_ESP_GRATUITOUS_ARP=y CONFIG_LWIP_ESP_GRATUITOUS_ARP=y
CONFIG_LWIP_GARP_TMR_INTERVAL=60 CONFIG_LWIP_GARP_TMR_INTERVAL=60
CONFIG_LWIP_TCPIP_RECVMBOX_SIZE=32 CONFIG_LWIP_TCPIP_RECVMBOX_SIZE=32

View File

@@ -455,8 +455,9 @@ CONFIG_LWIP_MAX_SOCKETS=16
# CONFIG_LWIP_USE_ONLY_LWIP_SELECT is not set # CONFIG_LWIP_USE_ONLY_LWIP_SELECT is not set
CONFIG_LWIP_SO_REUSE=y CONFIG_LWIP_SO_REUSE=y
CONFIG_LWIP_SO_REUSE_RXTOALL=y CONFIG_LWIP_SO_REUSE_RXTOALL=y
CONFIG_LWIP_IP4_REASSEMBLY=y #CONFIG_LWIP_IP_REASSEMBLY is not set
CONFIG_LWIP_IP6_REASSEMBLY=y CONFIG_LWIP_IP6_REASSEMBLY=Y
CONFIG_LWIP_IP4_REASSEMBLY=Y
CONFIG_LWIP_ESP_GRATUITOUS_ARP=y CONFIG_LWIP_ESP_GRATUITOUS_ARP=y
CONFIG_LWIP_GARP_TMR_INTERVAL=60 CONFIG_LWIP_GARP_TMR_INTERVAL=60
CONFIG_LWIP_TCPIP_RECVMBOX_SIZE=32 CONFIG_LWIP_TCPIP_RECVMBOX_SIZE=32