From c0cfb2066bb56e95c9eb833df397830a9a85e709 Mon Sep 17 00:00:00 2001 From: carlosperate Date: Sun, 16 Oct 2016 21:00:53 +0100 Subject: [PATCH] Update CIs to use newever dep vers and print more info. --- .appveyor.yml | 7 +++++-- .travis.yml | 24 ++++++++++++++---------- circle.yml | 13 +++++++++---- 3 files changed, 28 insertions(+), 16 deletions(-) diff --git a/.appveyor.yml b/.appveyor.yml index fbdf9e4a86..4912d38502 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -1,5 +1,5 @@ environment: - nodejs_version: "0.12.7" + nodejs_version: "Stable" matrix: # First group is 32 bit python 2.7 - PYTHON: "C:\\Python27" @@ -33,10 +33,13 @@ init: # Prepare pip and pip3, PATH iterated left to right first hit wins - cmd: set PATH=%PYTHON%\scripts;%PYTHON3%\scripts;%PATH% - cmd: ECHO Path - %PATH% + - cmd: "%PIP% --version" + - cmd: "%PIP3% --version" # Ensure node x86 (appveyor powershell script to switch installed versions) - - ps: Install-Product node 5.1.0 x86 + - ps: Install-Product node 'Stable' x86 - cmd: node --version + - cmd: node -p "process.arch" - cmd: npm --version install: diff --git a/.travis.yml b/.travis.yml index 0909b3fc10..7a9584c188 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,27 +1,30 @@ -# We are using the iOS build system to create Mac OS X python builds -language: objective-c +os: osx +osx_image: beta-xcode6.1 +language: node_js +node_js: '6' before_install: # OS extra info + - sw_vers - uname -a - python --version - python -c "import struct; print(struct.calcsize('P') * 8)" - - pip freeze # Install Python 2 and 3 with pip and check versions - brew update - - brew install python3 - - brew link --overwrite python3 - brew install python - - brew link --overwrite python + - brew unlink python && brew link python + - brew install python3 + - brew unlink python3 && brew link python3 + - brew install libcouchbase - PATH=/usr/local/bin:$PATH - echo $PATH - python --version - python -c "import struct; print(struct.calcsize('P') * 8)" + - pip --version - python3 --version - python3 -c "import struct; print(struct.calcsize('P') * 8)" - - - brew install libcouchbase + - pip3 --version # Install Python packages (built with Python 3, tests for 2 and 3) - pip install mock @@ -31,10 +34,11 @@ before_install: - pip freeze - pip3 freeze - # Install node.js + # Travis make takes > 10 minutes, so need to increase wait - brew unlink node - - brew install node + - travis_wait brew install node - node --version + - node -p "process.arch" - npm --version # Build and pack Ardublockly diff --git a/circle.yml b/circle.yml index d6706843f7..61526d7e19 100644 --- a/circle.yml +++ b/circle.yml @@ -5,7 +5,7 @@ machine: # Indicating node also offers advantage of bypassing virtual environments node: - version: 5.1.0 + version: 5.5.0 # Override /etc/hosts hosts: @@ -35,8 +35,13 @@ dependencies: - sudo easy_install3 pip - python --version - python -c "import struct; print(struct.calcsize('P') * 8)" + - pip2 --version - python3 --version - python3 -c "import struct; print(struct.calcsize('P') * 8)" + - pip3 --version + + # The GLIBC version might have been updated with apt-get installs + - ldd --version # Python packages (built on Python 2, tests run both 2 and 3) - sudo pip2 install mock @@ -47,12 +52,12 @@ dependencies: - pip2 freeze # A current issue with pip causes this command to fail # https://github.com/pypa/pip/issues/3681 + # Fixed on the 26 May 2016, waiting for release > 8.1.2 #- pip3 freeze - # Install node.js - #- curl -sL https://deb.nodesource.com/setup_0.12 | sudo bash - - #- sudo apt-get install -y nodejs + # Check node.js versions - node --version + - node -p "process.arch" - npm --version override: