Skip to content

Commit 3e0f182

Browse files
committed
Merge branch 'release/v0.1.2'
2 parents f1da185 + f2c4e0a commit 3e0f182

File tree

4 files changed

+30
-11
lines changed

4 files changed

+30
-11
lines changed

.travis.yml

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,26 @@
11
language: python
22
python:
3-
- "2.7"
3+
- "2.7"
44

55
env:
6-
- PLATFORMIO_PROJECT_DIR=examples/arduino-blink
7-
- PLATFORMIO_PROJECT_DIR=examples/arduino-webserver
8-
- PLATFORMIO_PROJECT_DIR=examples/arduino-wifiscan
9-
- PLATFORMIO_PROJECT_DIR=examples/native-sdk
10-
- PLATFORMIO_PROJECT_DIR=examples/simba-blink
6+
- PLATFORMIO_PROJECT_DIR=examples/arduino-blink
7+
- PLATFORMIO_PROJECT_DIR=examples/arduino-webserver
8+
- PLATFORMIO_PROJECT_DIR=examples/arduino-wifiscan
9+
- PLATFORMIO_PROJECT_DIR=examples/native-sdk
10+
- PLATFORMIO_PROJECT_DIR=examples/simba-blink
1111

1212
install:
13-
- pip install -U https://github.com/platformio/platformio/archive/develop.zip
14-
- platformio platform install file://.
13+
- pip install -U https://github.com/platformio/platformio/archive/develop.zip
14+
- platformio platform install file://.
1515

1616
script:
17-
- platformio run -d $PLATFORMIO_PROJECT_DIR
17+
- platformio run -d $PLATFORMIO_PROJECT_DIR
18+
19+
notifications:
20+
email: false
21+
22+
slack:
23+
rooms:
24+
secure: zKv2HzE18J8f+mHUeoNylXSvh6IBlfaaf2H96cicwGB3p53jOXBXO/99N7MVe6UnkJludmVeTGim4timqZdCOLglUPxIo8lSFSp5+4dO+WCpZB7z9P+vw4oy+qV+5Kp1EhDQnOybg/7DdYiJiCVz1psDZH+oYRqnW/+lU6s48svItrUpy6s36OeZJsYP9jjoWnSyzAemvO3kurC3Gib475tJfKIMVd5l9Lmj3yuALonDj6z6DXHyM8lExxRbaAe22CvHzuTXs3N0S/d34Gdi7+f/+NOcKrdBgNbzMnchtwLgnX8uqGAp+3D96JmTNFxdBc1uY82WdDY/ij2X/f6GFzIWgXRI7medHxvWqUFdRC1Z6bK1t36QsPgot2A3nT4oJnlJ/NqpwsjnSN60emDmkbDUf0p1JzErhHHQTVrasTWOX7yXVteXXIIP1HYR1A+5VMjO+6r20J9AM+QYm/b+9Rmy6t2uMdmimiRTy2fQxH/eExWSmJqrzdvgWHPc8gPxj9Ib8mryVegFlkajswv/rh2L8I5FZwNTot0+qwYFyst+hNm0PBVBmcyLhSW4v2/sVBwq38ir4NyXtnps46S7VNKh7b8kdO2o4f8oRkv+PWSnnK6N6tej20CAZeBjTh2puIl2HVL47/rCQA7DZMiJP+iGet6HG6pWKktilvfhSLs=
25+
on_failure: always
26+
on_success: change

appveyor.yml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,11 @@ install:
1616

1717
test_script:
1818
- cmd: platformio run -d %PLATFORMIO_PROJECT_DIR%
19+
20+
notifications:
21+
- provider: Slack
22+
incoming_webhook:
23+
secure: E9H0SU0Ju7WLDvgxsV8cs3J62T3nTTX7QkEjsczN0Sto/c9hWkVfhc5gGWUkxhlD975cokHByKGJIdwYwCewqOI+7BrcT8U+nlga4Uau7J8=
24+
on_build_success: false
25+
on_build_failure: true
26+
on_build_status_changed: true

builder/main.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,6 @@ def _get_board_f_flash(env):
122122
UPLOADEROTA=join("$FRAMEWORK_ARDUINOESP8266_DIR", "tools", "espota.py"),
123123

124124
UPLOADERFLAGS=[
125-
"-vv",
126125
"-cd", "$UPLOAD_RESETMETHOD",
127126
"-cb", "$UPLOAD_SPEED",
128127
"-cp", '"$UPLOAD_PORT"'
@@ -152,6 +151,9 @@ def _get_board_f_flash(env):
152151
ASFLAGS=env.get("CCFLAGS", [])[:]
153152
)
154153

154+
if not env.GetOption("silent"):
155+
env.Prepend(UPLOADERFLAGS=["-vv"])
156+
155157

156158
#
157159
# SPIFFS

platform.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"type": "git",
1717
"url": "https://github.com/platformio/platform-espressif.git"
1818
},
19-
"version": "0.1.1",
19+
"version": "0.1.2",
2020
"packageRepositories": [
2121
"https://dl.bintray.com/platformio/dl-packages/manifest.json",
2222
"https://sourceforge.net/projects/platformio-storage/files/packages/manifest.json/download",

0 commit comments

Comments
 (0)