diff --git a/.travis.yml b/.travis.yml index f0ef946..008251c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,8 +13,8 @@ after_script: echo Uploading *.tgz to $S3_BUCKET; curl -Ls https://github.com/rlmcpherson/s3gof3r/releases/download/v0.5.0/gof3r_0.5.0_linux_amd64.tar.gz | tar zxf - gof3r_0.5.0_linux_amd64/gof3r; mv gof3r*/gof3r .; - ls *.tgz | xargs -I {} ./gof3r put -b $S3_BUCKET -k espruino/{} --acl public-read -p {}; - ls *.tgz | xargs -I {} echo \"URL: http://$S3_BUCKET/espruino/{}\"; + ls *.tgz | xargs -I {} ./gof3r put -b $S3_BUCKET -k esp-link/{} --acl public-read -p {}; + ls *.tgz | xargs -I {} echo \"URL: http://$S3_BUCKET/esp-link/{}\"; fi" compiler: gcc @@ -25,9 +25,6 @@ script: - export XTENSA_TOOLS_ROOT=$PWD/xtensa-lx106-elf/bin/ - export BRANCH=$TRAVIS_BRANCH #- export SDK_BASE=$PWD/esp_iot_sdk_v2.0.0.p1 - - ls - - ls .. - - echo $PWD - make release notifications: diff --git a/Makefile b/Makefile index 7b90c82..d6d3265 100644 --- a/Makefile +++ b/Makefile @@ -485,8 +485,8 @@ release: all $(Q) cp $(FW_BASE)/user1.bin $(FW_BASE)/user2.bin $(SDK_BASE)/bin/blank.bin \ "$(SDK_BASE)/bin/boot_v1.6.bin" "$(SDK_BASE)/bin/esp_init_data_default.bin" \ wiflash avrflash release/esp-link-$(BRANCH) - $(Q) tar zcf esp-link-$(BRANCH).tgz -C release esp-link-$(BRANCH) - $(Q) echo "Release file: esp-link-$(BRANCH).tgz" + $(Q) tar zcf esp-link-$(BRANCH)-$(SHA).tgz -C release esp-link-$(BRANCH) + $(Q) echo "Release file: esp-link-$(BRANCH)-$(SHA).tgz" $(Q) rm -rf release clean: diff --git a/esp-link/cgi.c b/esp-link/cgi.c index d5b7fc6..d667be3 100644 --- a/esp-link/cgi.c +++ b/esp-link/cgi.c @@ -214,7 +214,7 @@ int ICACHE_FLASH_ATTR cgiMenu(HttpdConnData *connData) { "\"REST/MQTT\", \"/mqtt.html\", " #endif "\"Debug log\", \"/log.html\"," - "\"Upgrade Firmware\", \"/flash.html\"" + "\"Upgrade Firmware\", \"/flash.html\"," "\"Web Server\", \"/web-server.html\"" "%s" " ], "