1
0
mirror of https://github.com/esp8266/Arduino.git synced 2025-04-19 23:22:16 +03:00

use arduino IDE stable in CI (#6572)

* fix CI by using a stable arduino/builder version
* get rid of --allow-unauthenticated issue
This commit is contained in:
david gauchard 2019-10-01 00:42:46 +02:00 committed by GitHub
parent ffe5476fc4
commit d4757542e4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 31 additions and 18 deletions

View File

@ -6,14 +6,6 @@ git:
depth: 1 depth: 1
submodules: false submodules: false
addons:
apt:
sources:
- ubuntu-toolchain-r-test
packages:
- g++-7
- gcc-7
before_install: before_install:
- git submodule update --init # no recursive update - git submodule update --init # no recursive update
@ -87,7 +79,11 @@ jobs:
- name: "Host tests" - name: "Host tests"
stage: build stage: build
script: $TRAVIS_BUILD_DIR/tests/ci/host_test.sh script: $TRAVIS_BUILD_DIR/tests/ci/host_test.sh
install: sudo apt-get install valgrind lcov install:
- sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
- sudo apt-get update -q
- sudo apt-get install -y --allow-unauthenticated g++-7 gcc-7
- sudo apt-get install valgrind lcov
env: CC=gcc-7 CXX=g++-7 env: CC=gcc-7 CXX=g++-7
- name: "Docs" - name: "Docs"
@ -105,6 +101,10 @@ jobs:
- name: "Mock trivial test" - name: "Mock trivial test"
stage: build stage: build
script: $TRAVIS_BUILD_DIR/tests/buildm.sh script: $TRAVIS_BUILD_DIR/tests/buildm.sh
install:
- sudo add-apt-repository ppa:ubuntu-toolchain-r/test -y
- sudo apt-get update -q
- sudo apt-get install -y --allow-unauthenticated g++-7 gcc-7
env: CC=gcc-7 CXX=g++-7 env: CC=gcc-7 CXX=g++-7
- name: "Mac OSX can build sketches" - name: "Mac OSX can build sketches"

View File

@ -153,6 +153,14 @@ function install_libraries()
function install_ide() function install_ide()
{ {
#local idever='nightly'
#local ideurl='https://www.arduino.cc/download.php?f=/arduino-nightly'
local idever='1.8.10'
local ideurl="https://downloads.arduino.cc/arduino-$idever"
echo "using Arduino IDE distribution ${idever}"
local ide_path=$1 local ide_path=$1
local core_path=$2 local core_path=$2
local debug=$3 local debug=$3
@ -164,8 +172,9 @@ function install_ide()
choco install --no-progress unzip choco install --no-progress unzip
choco install --no-progress sed choco install --no-progress sed
#choco install --no-progress golang #choco install --no-progress golang
test -r arduino-nightly-windows.zip || wget -nv -O arduino-nightly-windows.zip https://www.arduino.cc/download.php?f=/arduino-nightly-windows.zip test -r arduino-windows.zip || wget -nv -O arduino-windows.zip "${ideurl}-windows.zip"
unzip -q arduino-nightly-windows.zip unzip -q arduino-windows.zip
mv arduino-${idever} arduino-distrib
elif [ "$MACOSX" = "1" ]; then elif [ "$MACOSX" = "1" ]; then
# MACOS only has next-to-obsolete Python2 installed. Install Python 3 from python.org # MACOS only has next-to-obsolete Python2 installed. Install Python 3 from python.org
wget https://www.python.org/ftp/python/3.7.4/python-3.7.4-macosx10.9.pkg wget https://www.python.org/ftp/python/3.7.4/python-3.7.4-macosx10.9.pkg
@ -173,15 +182,17 @@ function install_ide()
# Install the Python3 certificates, because SSL connections fail w/o them and of course they aren't installed by default. # Install the Python3 certificates, because SSL connections fail w/o them and of course they aren't installed by default.
( cd "/Applications/Python 3.7/" && sudo "./Install Certificates.command" ) ( cd "/Applications/Python 3.7/" && sudo "./Install Certificates.command" )
# Hack to place arduino-builder in the same spot as sane OSes # Hack to place arduino-builder in the same spot as sane OSes
test -r arduino.zip || wget -O arduino.zip https://downloads.arduino.cc/arduino-nightly-macosx.zip test -r arduino-macos.zip || wget -O arduino-macos.zip "${ideurl}-macosx.zip"
unzip -q arduino.zip unzip -q arduino-macos.zip
mv Arduino.app arduino-nightly mv Arduino.app arduino-distrib
mv arduino-nightly/Contents/Java/* arduino-nightly/. mv arduino-distrib/Contents/Java/* arduino-distrib/.
else else
test -r arduino.tar.xz || wget -O arduino.tar.xz https://www.arduino.cc/download.php?f=/arduino-nightly-linux64.tar.xz #test -r arduino.tar.xz || wget -O arduino.tar.xz https://www.arduino.cc/download.php?f=/arduino-nightly-linux64.tar.xz
tar xf arduino.tar.xz test -r arduino-linux.tar.xz || wget -O arduino-linux.tar.xz "${ideurl}-linux64.tar.xz"
tar xf arduino-linux.tar.xz
mv arduino-${idever} arduino-distrib
fi fi
mv arduino-nightly $ide_path mv arduino-distrib $ide_path
cd $ide_path/hardware cd $ide_path/hardware
mkdir esp8266com mkdir esp8266com
cd esp8266com cd esp8266com

View File

@ -84,6 +84,8 @@ done
cp tests/platformio.sh tests/platformio-custom.sh cp tests/platformio.sh tests/platformio-custom.sh
sed -i 's,pip ,pip2 ,g' tests/platformio-custom.sh sed -i 's,pip ,pip2 ,g' tests/platformio-custom.sh
git submodule update --init
export HOME="${TMPCI}" export HOME="${TMPCI}"
export TRAVIS_BUILD_DIR="${TMPCI}" export TRAVIS_BUILD_DIR="${TMPCI}"
export BUILD_TYPE="$BUILD_TYPE" export BUILD_TYPE="$BUILD_TYPE"