Skip to content

Commit 997f2e4

Browse files
committed
Update travis/appveyor scripts
Add additional build stage for C++17
1 parent 0ba67a2 commit 997f2e4

File tree

6 files changed

+42
-9
lines changed

6 files changed

+42
-9
lines changed

.appveyor/build.cmd

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@ REM Windows build script
22

33
set SMING_HOME=%APPVEYOR_BUILD_FOLDER%\Sming
44

5-
if "%SMING_ARCH%" == "Esp8266" set ESP_HOME=c:\Espressif
5+
if "%build_compiler%" == "udk" set ESP_HOME=%UDK_ROOT%
6+
if "%build_compiler%" == "eqt" set ESP_HOME=%EQT_ROOT%
67

78
cd %SMING_HOME%
89
gcc -v

.appveyor/install.cmd

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,15 @@ goto :%SMING_ARCH%
88

99
:Esp8266
1010

11+
REM Old toolchain
1112
choco install esp8266-udk --source https://www.myget.org/F/sming/ -y --no-progress
1213

14+
REM New toolchain
15+
mkdir %EQT_ROOT%
16+
set TOOLCHAIN=x86_64-w64-mingw32.xtensa-lx106-elf-dd9f9a2.1569802152.zip
17+
curl -LO https://github.com/earlephilhower/esp-quick-toolchain/releases/download/3.0.0-gnu2/%TOOLCHAIN%
18+
7z -o%EQT_ROOT% x %TOOLCHAIN%
19+
1320
goto :EOF
1421

1522

.travis.yml

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,23 @@ jobs:
2323
- graphviz-dev
2424
- xmlstarlet
2525
- jq
26-
env: SMING_ARCH=Host
26+
env:
27+
- SMING_ARCH=Host
28+
2729
- stage: build
2830
os: linux
29-
env: SMING_ARCH=Esp8266 SDK_VERSION=3.0.1
31+
env:
32+
- SMING_ARCH=Esp8266
33+
- SDK_VERSION=3.0.1
34+
- ESP_HOME=$TRAVIS_BUILD_DIR/opt/esp-alt-sdk
35+
36+
- stage: build c++17
37+
os: linux
38+
env:
39+
- SMING_ARCH=Esp8266
40+
- SDK_VERSION=3.0.1
41+
- ESP_HOME=$TRAVIS_BUILD_DIR/opt/esp-quick-toolchain
42+
3043
git:
3144
submodules: false
3245
addons:

.travis/build.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ fi
2727

2828
# Setup ARCH SDK paths
2929
if [ "$SMING_ARCH" == "Esp8266" ]; then
30-
export ESP_HOME=$TRAVIS_BUILD_DIR/opt/esp-alt-sdk
3130
export PATH=$PATH:$ESP_HOME/xtensa-lx106-elf/bin:$ESP_HOME/utils/
3231
fi
3332

.travis/install.sh

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,17 @@ if [ "$TRAVIS_BUILD_STAGE_NAME" == "Test" ]; then
99
fi
1010

1111
if [ "$SMING_ARCH" == "Esp8266" ]; then
12-
mkdir -p $TRAVIS_BUILD_DIR/opt/esp-alt-sdk
13-
1412
if [ "$TRAVIS_OS_NAME" == "linux" ]; then
15-
wget --no-verbose https://github.com/nodemcu/nodemcu-firmware/raw/2d958750b56fc60297f564b4ec303e47928b5927/tools/esp-open-sdk.tar.xz
16-
tar -Jxvf esp-open-sdk.tar.xz; ln -s $(pwd)/esp-open-sdk/xtensa-lx106-elf $TRAVIS_BUILD_DIR/opt/esp-alt-sdk/.
13+
# Old toolchain
14+
mkdir -p $TRAVIS_BUILD_DIR/opt/esp-alt-sdk
15+
wget --no-verbose https://github.com/nodemcu/nodemcu-firmware/raw/2d958750b56fc60297f564b4ec303e47928b5927/tools/esp-open-sdk.tar.xz
16+
tar -Jxvf esp-open-sdk.tar.xz; ln -s $(pwd)/esp-open-sdk/xtensa-lx106-elf $TRAVIS_BUILD_DIR/opt/esp-alt-sdk/.
17+
18+
# New toolchain
19+
TOOLCHAIN=x86_64-linux-gnu.xtensa-lx106-elf-dd9f9a2.1569802152.tar.gz
20+
wget --no-verbose https://github.com/earlephilhower/esp-quick-toolchain/releases/download/3.0.0-gnu2/$TOOLCHAIN
21+
mkdir -p opt/esp-quick-toolchain
22+
tar -zxf $TOOLCHAIN -C opt/esp-quick-toolchain --totals
1723
fi
1824

1925
fi # Esp8266

appveyor.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,20 @@ os: Windows Server 2012 R2
33
environment:
44
PATH: C:\MinGW\msys\1.0\bin;C:\MinGW\bin;C:\Python27\scripts;%PATH%
55
SDK_BUILD: 258
6+
UDK_ROOT: C:\Espressif
7+
EQT_ROOT: C:\esp-quick-toolchain
68
matrix:
79
- build_platform: "x86"
810
build_compiler: "mingw"
911
SMING_ARCH: Host
1012

1113
- build_platform: "x86"
12-
build_compiler: "mingw"
14+
build_compiler: "udk"
15+
SMING_ARCH: Esp8266
16+
SDK_VERSION: 3.0.1
17+
18+
- build_platform: "x86"
19+
build_compiler: "eqt"
1320
SMING_ARCH: Esp8266
1421
SDK_VERSION: 3.0.1
1522

0 commit comments

Comments
 (0)