From e1e4795a85e7f988362831cb636fdecb4b713a92 Mon Sep 17 00:00:00 2001 From: david gauchard Date: Mon, 30 Sep 2019 22:08:28 +0200 Subject: [PATCH 1/9] fix CI by using a stable arduino/builder version --- tests/common.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/common.sh b/tests/common.sh index b93bd57ba9..4803fee291 100755 --- a/tests/common.sh +++ b/tests/common.sh @@ -178,7 +178,10 @@ function install_ide() mv Arduino.app arduino-nightly mv arduino-nightly/Contents/Java/* arduino-nightly/. else - test -r arduino.tar.xz || wget -O arduino.tar.xz https://www.arduino.cc/download.php?f=/arduino-nightly-linux64.tar.xz + # nightlie + #test -r arduino.tar.xz || wget -O arduino.tar.xz https://www.arduino.cc/download.php?f=/arduino-nightly-linux64.tar.xz + # stable 1.8.10 + test -r arduino.tar.xz || wget -O arduino.tar.xz https://downloads.arduino.cc/arduino-1.8.10-linux64.tar.xz tar xf arduino.tar.xz fi mv arduino-nightly $ide_path From fd6b6876e8212328b6bf59958fc6292aa3e34891 Mon Sep 17 00:00:00 2001 From: david gauchard Date: Mon, 30 Sep 2019 22:13:08 +0200 Subject: [PATCH 2/9] wip --- tests/common.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/common.sh b/tests/common.sh index 4803fee291..2f1f663912 100755 --- a/tests/common.sh +++ b/tests/common.sh @@ -180,9 +180,11 @@ function install_ide() else # nightlie #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 # stable 1.8.10 test -r arduino.tar.xz || wget -O arduino.tar.xz https://downloads.arduino.cc/arduino-1.8.10-linux64.tar.xz tar xf arduino.tar.xz + mv arduino-1.8.10 arduino-nightly fi mv arduino-nightly $ide_path cd $ide_path/hardware From e94d720217f0cf33e5f590b9bc238757807568ab Mon Sep 17 00:00:00 2001 From: david gauchard Date: Mon, 30 Sep 2019 22:30:16 +0200 Subject: [PATCH 3/9] wip --- tests/common.sh | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/tests/common.sh b/tests/common.sh index 2f1f663912..36f26b813d 100755 --- a/tests/common.sh +++ b/tests/common.sh @@ -153,6 +153,12 @@ function install_libraries() 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" + local ide_path=$1 local core_path=$2 local debug=$3 @@ -164,8 +170,9 @@ function install_ide() choco install --no-progress unzip choco install --no-progress sed #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 - unzip -q arduino-nightly-windows.zip + test -r arduino-windows.zip || wget -nv -O arduino-windows.zip "${ideurl}-windows.zip" + unzip -q arduino-windows.zip + mv arduino-${idever} arduino-distrib elif [ "$MACOSX" = "1" ]; then # 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 @@ -173,20 +180,17 @@ function install_ide() # 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" ) # 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 - unzip -q arduino.zip - mv Arduino.app arduino-nightly - mv arduino-nightly/Contents/Java/* arduino-nightly/. + test -r arduino-macos.zip || wget -O arduino-macos.zip "${ideurl}-macosx.zip" + unzip -q arduino-macos.zip + mv Arduino.app arduino-distrib + mv arduino-distrib/Contents/Java/* arduino-distrib/. else - # nightlie #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 - # stable 1.8.10 - test -r arduino.tar.xz || wget -O arduino.tar.xz https://downloads.arduino.cc/arduino-1.8.10-linux64.tar.xz + test -r arduino-linux.tar.xz || wget -O arduino-linux.tar.xz "${ideurl}-linux64.tar.xz" tar xf arduino.tar.xz - mv arduino-1.8.10 arduino-nightly + mv arduino-${idever} arduino-distrib fi - mv arduino-nightly $ide_path + mv arduino-distrib $ide_path cd $ide_path/hardware mkdir esp8266com cd esp8266com From 060e32fe5228dc051f20821acf4bd84251f66deb Mon Sep 17 00:00:00 2001 From: david gauchard Date: Mon, 30 Sep 2019 22:32:20 +0200 Subject: [PATCH 4/9] wip --- tests/common.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/common.sh b/tests/common.sh index 36f26b813d..27fb561af3 100755 --- a/tests/common.sh +++ b/tests/common.sh @@ -187,7 +187,7 @@ function install_ide() 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-linux.tar.xz || wget -O arduino-linux.tar.xz "${ideurl}-linux64.tar.xz" - tar xf arduino.tar.xz + tar xf arduino-linux.tar.xz mv arduino-${idever} arduino-distrib fi mv arduino-distrib $ide_path From 9ad035747a35c62302f1f60f9afbeddc3787900e Mon Sep 17 00:00:00 2001 From: david gauchard Date: Mon, 30 Sep 2019 22:38:40 +0200 Subject: [PATCH 5/9] wip --- tests/common.sh | 10 ++++++---- tests/run_CI_locally.sh | 2 ++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/tests/common.sh b/tests/common.sh index 27fb561af3..af475b9fb8 100755 --- a/tests/common.sh +++ b/tests/common.sh @@ -153,11 +153,13 @@ function install_libraries() function install_ide() { - #local idever='nightly' - #local ideurl='https://www.arduino.cc/download.php?f=/arduino-nightly' + 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" + #local idever='1.8.10' + #local ideurl="https://downloads.arduino.cc/arduino-$idever" + + echo "using Arduino IDE distribution ${idever}" local ide_path=$1 local core_path=$2 diff --git a/tests/run_CI_locally.sh b/tests/run_CI_locally.sh index 65b91277f2..f95ad88220 100755 --- a/tests/run_CI_locally.sh +++ b/tests/run_CI_locally.sh @@ -84,6 +84,8 @@ done cp tests/platformio.sh tests/platformio-custom.sh sed -i 's,pip ,pip2 ,g' tests/platformio-custom.sh +git submodule upate --init + export HOME="${TMPCI}" export TRAVIS_BUILD_DIR="${TMPCI}" export BUILD_TYPE="$BUILD_TYPE" From c75d2e21d54a5dbfd6284a77a48777429e80c2dd Mon Sep 17 00:00:00 2001 From: david gauchard Date: Mon, 30 Sep 2019 22:39:39 +0200 Subject: [PATCH 6/9] wip --- tests/run_CI_locally.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/run_CI_locally.sh b/tests/run_CI_locally.sh index f95ad88220..a370461f6a 100755 --- a/tests/run_CI_locally.sh +++ b/tests/run_CI_locally.sh @@ -84,7 +84,7 @@ done cp tests/platformio.sh tests/platformio-custom.sh sed -i 's,pip ,pip2 ,g' tests/platformio-custom.sh -git submodule upate --init +git submodule update --init export HOME="${TMPCI}" export TRAVIS_BUILD_DIR="${TMPCI}" From 49155297064f58efe77c11ac1ea58b0ab0161091 Mon Sep 17 00:00:00 2001 From: david gauchard Date: Mon, 30 Sep 2019 22:42:38 +0200 Subject: [PATCH 7/9] wip - maybe final --- tests/common.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/common.sh b/tests/common.sh index af475b9fb8..c5184cece5 100755 --- a/tests/common.sh +++ b/tests/common.sh @@ -153,11 +153,11 @@ function install_libraries() function install_ide() { - local idever='nightly' - local ideurl='https://www.arduino.cc/download.php?f=/arduino-nightly' + #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" + local idever='1.8.10' + local ideurl="https://downloads.arduino.cc/arduino-$idever" echo "using Arduino IDE distribution ${idever}" From 9a5098c7d2f03dd2e882a09b8b5a3eb0e5143f0b Mon Sep 17 00:00:00 2001 From: david gauchard Date: Mon, 30 Sep 2019 23:04:14 +0200 Subject: [PATCH 8/9] trying to get rid of --allow-unauthenticated issue --- .travis.yml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index e6a2b4012c..f9fe3b7896 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,12 +7,9 @@ git: submodules: false addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - g++-7 - - gcc-7 + - 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 before_install: - git submodule update --init # no recursive update From 7f5c1f090d7ddd923f0a18c5df1f931dce76de0b Mon Sep 17 00:00:00 2001 From: david gauchard Date: Tue, 1 Oct 2019 00:04:39 +0200 Subject: [PATCH 9/9] attempt to fix apt --- .travis.yml | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/.travis.yml b/.travis.yml index f9fe3b7896..1e54251c8d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,11 +6,6 @@ git: depth: 1 submodules: false -addons: - - 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 - before_install: - git submodule update --init # no recursive update @@ -84,7 +79,11 @@ jobs: - name: "Host tests" stage: build 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 - name: "Docs" @@ -102,6 +101,10 @@ jobs: - name: "Mock trivial test" stage: build 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 - name: "Mac OSX can build sketches"