Merge remote-tracking branch 'origin/master' into rc

This commit is contained in:
Paulus Schoutsen 2019-06-04 14:33:49 -07:00
commit d0715c75c0

View File

@ -5,6 +5,7 @@ trigger:
branches: branches:
include: include:
- dev - dev
- master
tags: tags:
include: include:
- '*' - '*'
@ -12,7 +13,7 @@ variables:
- name: versionBuilder - name: versionBuilder
value: '3.2' value: '3.2'
- name: versionWheels - name: versionWheels
value: '0.3' value: '0.7'
- group: docker - group: docker
- group: wheels - group: wheels
- group: github - group: github
@ -22,7 +23,7 @@ variables:
jobs: jobs:
- job: 'Wheels' - job: 'Wheels'
condition: eq(variables['Build.SourceBranchName'], 'dev') condition: or(eq(variables['Build.SourceBranchName'], 'dev'), eq(variables['Build.SourceBranchName'], 'master'))
timeoutInMinutes: 360 timeoutInMinutes: 360
pool: pool:
vmImage: 'ubuntu-latest' vmImage: 'ubuntu-latest'
@ -44,7 +45,8 @@ jobs:
sudo apt-get update sudo apt-get update
sudo apt-get install -y --no-install-recommends \ sudo apt-get install -y --no-install-recommends \
qemu-user-static \ qemu-user-static \
binfmt-support binfmt-support \
curl
sudo mount binfmt_misc -t binfmt_misc /proc/sys/fs/binfmt_misc sudo mount binfmt_misc -t binfmt_misc /proc/sys/fs/binfmt_misc
sudo update-binfmts --enable qemu-arm sudo update-binfmts --enable qemu-arm
@ -59,39 +61,45 @@ jobs:
- script: sudo docker pull homeassistant/$(buildArch)-wheels:$(versionWheels) - script: sudo docker pull homeassistant/$(buildArch)-wheels:$(versionWheels)
displayName: 'Install wheels builder' displayName: 'Install wheels builder'
- script: | - script: |
cp requirements_all.txt requirements_hassio.txt cp requirements_all.txt requirements_wheels.txt
if [ "$(Build.SourceBranchName)" == "dev" ]; then
curl -s -o requirements_diff.txt https://raw.githubusercontent.com/home-assistant/home-assistant/master/requirements_all.txt
else
touch requirements_diff.txt
fi
# Enable because we can build it requirement_files="requirements_wheels.txt requirements_diff.txt"
sed -i "s|# pytradfri|pytradfri|g" requirements_hassio.txt for requirement_file in ${requirement_files}; do
sed -i "s|# pybluez|pybluez|g" requirements_hassio.txt sed -i "s|# pytradfri|pytradfri|g" ${requirement_file}
sed -i "s|# bluepy|bluepy|g" requirements_hassio.txt sed -i "s|# pybluez|pybluez|g" ${requirement_file}
sed -i "s|# beacontools|beacontools|g" requirements_hassio.txt sed -i "s|# bluepy|bluepy|g" ${requirement_file}
sed -i "s|# RPi.GPIO|RPi.GPIO|g" requirements_hassio.txt sed -i "s|# beacontools|beacontools|g" ${requirement_file}
sed -i "s|# raspihats|raspihats|g" requirements_hassio.txt sed -i "s|# RPi.GPIO|RPi.GPIO|g" ${requirement_file}
sed -i "s|# rpi-rf|rpi-rf|g" requirements_hassio.txt sed -i "s|# raspihats|raspihats|g" ${requirement_file}
sed -i "s|# blinkt|blinkt|g" requirements_hassio.txt sed -i "s|# rpi-rf|rpi-rf|g" ${requirement_file}
sed -i "s|# fritzconnection|fritzconnection|g" requirements_hassio.txt sed -i "s|# blinkt|blinkt|g" ${requirement_file}
sed -i "s|# pyuserinput|pyuserinput|g" requirements_hassio.txt sed -i "s|# fritzconnection|fritzconnection|g" ${requirement_file}
sed -i "s|# evdev|evdev|g" requirements_hassio.txt sed -i "s|# pyuserinput|pyuserinput|g" ${requirement_file}
sed -i "s|# smbus-cffi|smbus-cffi|g" requirements_hassio.txt sed -i "s|# evdev|evdev|g" ${requirement_file}
sed -i "s|# i2csense|i2csense|g" requirements_hassio.txt sed -i "s|# smbus-cffi|smbus-cffi|g" ${requirement_file}
sed -i "s|# python-eq3bt|python-eq3bt|g" requirements_hassio.txt sed -i "s|# i2csense|i2csense|g" ${requirement_file}
sed -i "s|# pycups|pycups|g" requirements_hassio.txt sed -i "s|# python-eq3bt|python-eq3bt|g" ${requirement_file}
sed -i "s|# homekit|homekit|g" requirements_hassio.txt sed -i "s|# pycups|pycups|g" ${requirement_file}
sed -i "s|# decora_wifi|decora_wifi|g" requirements_hassio.txt sed -i "s|# homekit|homekit|g" ${requirement_file}
sed -i "s|# decora|decora|g" requirements_hassio.txt sed -i "s|# decora_wifi|decora_wifi|g" ${requirement_file}
sed -i "s|# PySwitchbot|PySwitchbot|g" requirements_hassio.txt sed -i "s|# decora|decora|g" ${requirement_file}
sed -i "s|# pySwitchmate|pySwitchmate|g" requirements_hassio.txt sed -i "s|# PySwitchbot|PySwitchbot|g" ${requirement_file}
sed -i "s|# pySwitchmate|pySwitchmate|g" ${requirement_file}
# Disable because of error sed -i "s|# face_recognition|face_recognition|g" ${requirement_file}
sed -i "s|insteonplm|# insteonplm|g" requirements_hassio.txt done
displayName: 'Prepare requirements files for Hass.io' displayName: 'Prepare requirements files for Hass.io'
- script: | - script: |
sudo docker run --rm -v $(pwd):/data:ro -v $(pwd)/.ssh:/root/.ssh:rw \ sudo docker run --rm -v $(pwd):/data:ro -v $(pwd)/.ssh:/root/.ssh:rw \
homeassistant/$(buildArch)-wheels:$(versionWheels) \ homeassistant/$(buildArch)-wheels:$(versionWheels) \
--apk "build-base;cmake;git;linux-headers;bluez-dev;libffi-dev;openssl-dev;glib-dev;eudev-dev;libxml2-dev;libxslt-dev;libpng-dev;libjpeg-turbo-dev;tiff-dev;autoconf;automake;cups-dev;linux-headers;gmp-dev;mpfr-dev;mpc1-dev;ffmpeg-dev" \ --apk "build-base;cmake;git;linux-headers;bluez-dev;libffi-dev;openssl-dev;glib-dev;eudev-dev;libxml2-dev;libxslt-dev;libpng-dev;libjpeg-turbo-dev;tiff-dev;autoconf;automake;cups-dev;linux-headers;gmp-dev;mpfr-dev;mpc1-dev;ffmpeg-dev" \
--index https://wheels.hass.io \ --index $(wheelsIndex) \
--requirement requirements_hassio.txt \ --requirement requirements_wheels.txt \
--requirement-diff requirements_diff.txt \
--upload rsync \ --upload rsync \
--remote wheels@$(wheelsHost):/opt/wheels --remote wheels@$(wheelsHost):/opt/wheels
displayName: 'Run wheels build' displayName: 'Run wheels build'
@ -116,7 +124,6 @@ jobs:
fi fi
displayName: 'Check version of branch/tag' displayName: 'Check version of branch/tag'
- script: | - script: |
sudo apt-get update
sudo apt-get install -y --no-install-recommends \ sudo apt-get install -y --no-install-recommends \
jq curl jq curl