Skip to content

Commit b9792da

Browse files
Merge branch 'master' into patch-1
2 parents db3bbc3 + 8a64a12 commit b9792da

File tree

98 files changed

+1507
-993
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

98 files changed

+1507
-993
lines changed

.travis.yml

Lines changed: 55 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,13 @@ language: bash
22
os: linux
33
dist: trusty
44

5+
git:
6+
depth: 1
7+
submodules: false
8+
9+
before_install:
10+
- git submodule update --init # no recursive update
11+
512
cache:
613
directories:
714
- $HOME/astyle
@@ -13,72 +20,78 @@ stages:
1320
jobs:
1421
include:
1522
# Build stage. To save time, run all kinds of builds and tests in parallel.
16-
#
17-
# TODO: since we can now call different script for each job,
18-
# split the do-it-all common.sh into separate scripts responsible
19-
# for different types of jobs below:
20-
- name: "Host tests"
23+
24+
- name: "Platformio (1)"
2125
stage: build
22-
script: $TRAVIS_BUILD_DIR/tests/common.sh
26+
script: $TRAVIS_BUILD_DIR/tests/platformio.sh
2327
env:
24-
- BUILD_TYPE=host_tests
25-
install:
26-
- sudo apt-get install valgrind lcov
28+
- BUILD_PARITY=even
29+
- name: "Platformio (2)"
30+
stage: build
31+
script: $TRAVIS_BUILD_DIR/tests/platformio.sh
32+
env:
33+
- BUILD_PARITY=odd
2734

2835
- name: "Build (1)"
29-
script: $TRAVIS_BUILD_DIR/tests/common.sh
36+
stage: build
37+
script: $TRAVIS_BUILD_DIR/tests/build.sh
3038
env:
31-
- BUILD_TYPE=build_even
39+
- BUILD_PARITY=even
3240
- name: "Build (2)"
33-
script: $TRAVIS_BUILD_DIR/tests/common.sh
41+
stage: build
42+
script: $TRAVIS_BUILD_DIR/tests/build.sh
3443
env:
35-
- BUILD_TYPE=build_odd
44+
- BUILD_PARITY=odd
45+
3646
- name: "Debug (1)"
37-
script: $TRAVIS_BUILD_DIR/tests/common.sh
47+
stage: build
48+
script: $TRAVIS_BUILD_DIR/tests/debug.sh
3849
env:
39-
- BUILD_TYPE=debug_even
50+
- BUILD_PARITY=even
4051
- name: "Debug (2)"
41-
script: $TRAVIS_BUILD_DIR/tests/common.sh
52+
stage: build
53+
script: $TRAVIS_BUILD_DIR/tests/debug.sh
4254
env:
43-
- BUILD_TYPE=debug_odd
44-
- name: "Platformio (1)"
45-
script: $TRAVIS_BUILD_DIR/tests/common.sh
55+
- BUILD_PARITY=odd
56+
57+
- name: "Build IPv6 (1)"
58+
stage: build
59+
script: $TRAVIS_BUILD_DIR/tests/build6.sh
4660
env:
47-
- BUILD_TYPE=platformio_even
48-
- name: "Platformio (2)"
49-
script: $TRAVIS_BUILD_DIR/tests/common.sh
61+
- BUILD_PARITY=even
62+
- name: "Build IPv6 (2)"
63+
stage: build
64+
script: $TRAVIS_BUILD_DIR/tests/build6.sh
5065
env:
51-
- BUILD_TYPE=platformio_odd
66+
- BUILD_PARITY=odd
67+
68+
- name: "Host tests"
69+
stage: build
70+
script: $TRAVIS_BUILD_DIR/tests/ci/host_test.sh
71+
install: sudo apt-get install valgrind lcov
5272

5373
- name: "Docs"
54-
script: $TRAVIS_BUILD_DIR/tests/common.sh
55-
env:
56-
- BUILD_TYPE=docs
74+
stage: build
75+
script: $TRAVIS_BUILD_DIR/tests/ci/build_docs.sh
5776
install:
58-
- pip install --user -r doc/requirements.txt;
77+
- sudo apt-get install python3-pip
78+
- pip3 install --user -r doc/requirements.txt;
5979

6080
- name: "Style check"
61-
script: $TRAVIS_BUILD_DIR/tests/common.sh
62-
env:
63-
- BUILD_TYPE=style_check
64-
install:
65-
- >
66-
[ "$BUILD_TYPE" = "style_check" ] && {
67-
[ -f $HOME/astyle/build/gcc/bin/astyle ] || {
68-
wget -O astyle_3.1_linux.tar.gz https://sourceforge.net/projects/astyle/files/astyle/astyle%203.1/astyle_3.1_linux.tar.gz/download;
69-
tar -xf astyle_3.1_linux.tar.gz -C $HOME;
70-
make -C $HOME/astyle/build/gcc;
71-
}
72-
make -C $HOME/astyle/build/gcc prefix=$HOME install;
73-
} || true
81+
stage: build
82+
script: $TRAVIS_BUILD_DIR/tests/ci/style_check.sh
83+
install: tests/ci/install_astyle.sh
84+
85+
- name: "Boards"
86+
stage: build
87+
script: $TRAVIS_BUILD_DIR/tests/ci/build_boards.sh
7488

7589
# Deploy stage.
7690
# Here we build the package JSON (always) and do the deployments
7791
- name: "Package / deploy"
7892
stage: deploy
79-
script: $TRAVIS_BUILD_DIR/tests/common.sh
93+
script: tests/ci/build_package.sh
8094
env: BUILD_TYPE=package
81-
if: env(CI_GITHUB_API_KEY) IS present
8295
deploy:
8396
# Create Github release, upload artifacts
8497
- provider: releases

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Arduino core for ESP8266 WiFi chip
33

44
# Quick links
55

6-
- [Latest release documentation](https://arduino-esp8266.readthedocs.io/en/2.5.0-beta1/)
6+
- [Latest release documentation](https://arduino-esp8266.readthedocs.io/en/2.5.0-beta2/)
77
- [Current "git version" documentation](https://arduino-esp8266.readthedocs.io/en/latest/)
88
- [Install git version](https://arduino-esp8266.readthedocs.io/en/latest/installing.html#using-git-version) ([sources](doc/installing.rst#using-git-version))
99

@@ -36,7 +36,7 @@ Starting with 1.6.4, Arduino allows installation of third-party platform package
3636
#### Latest release [![Latest release](https://img.shields.io/github/release/esp8266/Arduino.svg)](https://github.com/esp8266/Arduino/releases/latest/)
3737
Boards manager link: `http://arduino.esp8266.com/stable/package_esp8266com_index.json`
3838

39-
Documentation: [https://arduino-esp8266.readthedocs.io/en/2.5.0-beta1/](https://arduino-esp8266.readthedocs.io/en/2.5.0-beta1/)
39+
Documentation: [https://arduino-esp8266.readthedocs.io/en/2.5.0-beta2/](https://arduino-esp8266.readthedocs.io/en/2.5.0-beta2/)
4040

4141
### Using git version (basic instructions)
4242
[![Linux build status](https://travis-ci.org/esp8266/Arduino.svg)](https://travis-ci.org/esp8266/Arduino)

0 commit comments

Comments
 (0)