Update travis/appveyor scripts

Add additional build stage for C++17
SmingHub · Dec 1, 2019 · 997f2e4 · 997f2e4
1 parent 0ba67a2
commit 997f2e4
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 9 deletions.
diff --git a/.appveyor/build.cmd b/.appveyor/build.cmd
@@ -2,7 +2,8 @@ REM Windows build script
 
 set SMING_HOME=%APPVEYOR_BUILD_FOLDER%\Sming
 
-if "%SMING_ARCH%" == "Esp8266" set ESP_HOME=c:\Espressif
+if "%build_compiler%" == "udk" set ESP_HOME=%UDK_ROOT%
+if "%build_compiler%" == "eqt" set ESP_HOME=%EQT_ROOT%
 
 cd %SMING_HOME%
 gcc -v

diff --git a/.appveyor/install.cmd b/.appveyor/install.cmd
@@ -8,8 +8,15 @@ goto :%SMING_ARCH%
 
 :Esp8266
 
+	REM Old toolchain
 	choco install esp8266-udk --source https://www.myget.org/F/sming/ -y --no-progress
 
+	REM New toolchain
+	mkdir %EQT_ROOT%
+	set TOOLCHAIN=x86_64-w64-mingw32.xtensa-lx106-elf-dd9f9a2.1569802152.zip
+	curl -LO https://github.com/earlephilhower/esp-quick-toolchain/releases/download/3.0.0-gnu2/%TOOLCHAIN%
+	7z -o%EQT_ROOT% x %TOOLCHAIN%
+
 	goto :EOF
 
 

diff --git a/.travis.yml b/.travis.yml
@@ -23,10 +23,23 @@ jobs:
         - graphviz-dev
         - xmlstarlet
         - jq
-    env: SMING_ARCH=Host
+    env:
+    - SMING_ARCH=Host
+
   - stage: build
     os: linux
-    env: SMING_ARCH=Esp8266 SDK_VERSION=3.0.1
+    env:
+    - SMING_ARCH=Esp8266
+    - SDK_VERSION=3.0.1
+    - ESP_HOME=$TRAVIS_BUILD_DIR/opt/esp-alt-sdk
+
+  - stage: build c++17
+    os: linux
+    env:
+    - SMING_ARCH=Esp8266
+    - SDK_VERSION=3.0.1
+    - ESP_HOME=$TRAVIS_BUILD_DIR/opt/esp-quick-toolchain
+
 git:
   submodules: false
 addons:

diff --git a/.travis/build.sh b/.travis/build.sh
@@ -27,7 +27,6 @@ fi
 
 # Setup ARCH SDK paths
 if [ "$SMING_ARCH" == "Esp8266" ]; then
-	export ESP_HOME=$TRAVIS_BUILD_DIR/opt/esp-alt-sdk
 	export PATH=$PATH:$ESP_HOME/xtensa-lx106-elf/bin:$ESP_HOME/utils/
 fi
 

diff --git a/.travis/install.sh b/.travis/install.sh
@@ -9,11 +9,17 @@ if [ "$TRAVIS_BUILD_STAGE_NAME" == "Test" ]; then
 fi
 
 if [ "$SMING_ARCH" == "Esp8266" ]; then
-	mkdir -p $TRAVIS_BUILD_DIR/opt/esp-alt-sdk
-
 	if [ "$TRAVIS_OS_NAME" == "linux" ]; then
-	  wget --no-verbose https://github.com/nodemcu/nodemcu-firmware/raw/2d958750b56fc60297f564b4ec303e47928b5927/tools/esp-open-sdk.tar.xz
-	  tar -Jxvf esp-open-sdk.tar.xz; ln -s $(pwd)/esp-open-sdk/xtensa-lx106-elf $TRAVIS_BUILD_DIR/opt/esp-alt-sdk/.
+		# Old toolchain
+		mkdir -p $TRAVIS_BUILD_DIR/opt/esp-alt-sdk
+		wget --no-verbose https://github.com/nodemcu/nodemcu-firmware/raw/2d958750b56fc60297f564b4ec303e47928b5927/tools/esp-open-sdk.tar.xz
+	  	tar -Jxvf esp-open-sdk.tar.xz; ln -s $(pwd)/esp-open-sdk/xtensa-lx106-elf $TRAVIS_BUILD_DIR/opt/esp-alt-sdk/.
+
+		# New toolchain
+		TOOLCHAIN=x86_64-linux-gnu.xtensa-lx106-elf-dd9f9a2.1569802152.tar.gz
+		wget --no-verbose https://github.com/earlephilhower/esp-quick-toolchain/releases/download/3.0.0-gnu2/$TOOLCHAIN
+		mkdir -p opt/esp-quick-toolchain
+	  	tar -zxf $TOOLCHAIN -C opt/esp-quick-toolchain --totals
 	fi
 
 fi # Esp8266
diff --git a/appveyor.yml b/appveyor.yml
@@ -3,13 +3,20 @@ os: Windows Server 2012 R2
 environment:
   PATH: C:\MinGW\msys\1.0\bin;C:\MinGW\bin;C:\Python27\scripts;%PATH%
   SDK_BUILD: 258
+  UDK_ROOT: C:\Espressif
+  EQT_ROOT: C:\esp-quick-toolchain
   matrix:
     - build_platform: "x86"
       build_compiler: "mingw"
       SMING_ARCH: Host
 
     - build_platform: "x86"
-      build_compiler: "mingw"
+      build_compiler: "udk"
+      SMING_ARCH: Esp8266
+      SDK_VERSION: 3.0.1
+
+    - build_platform: "x86"
+      build_compiler: "eqt"
       SMING_ARCH: Esp8266
       SDK_VERSION: 3.0.1