pidgin/pidgin

Merge to default to fix conflicts

2016-10-24, Mike Ruprecht
6dc8cae57962
Merge to default to fix conflicts
# vi:et:ts=2 sw=2 sts=2
image: pidgin/builder-debian:stretch
pipelines:
default:
- step:
script:
- set -ex
- ./autogen.sh --enable-debug --enable-gtk-doc
- make -s -j$(nproc)
- make -s -j$(nproc) distcheck
branches:
release-2.x.y:
- step:
image: pidgin/release-builder:release-2.x.y
script:
- set -ex
- ./autogen.sh --enable-debug
- make -s -j$(nproc)
- make -s -j$(nproc) check
- make distcheck