gplugin/builders

A bunch of updates for the ubuntu stuff and added a scanbuild image

2017-10-22, Gary Kramlich
bc3084e04859
Parents 4887f8b8b3ef
Children f215bd12d996
A bunch of updates for the ubuntu stuff and added a scanbuild image
5 files changed, 57 insertions(+), 4 deletions(-)
  • +12 -0
    Dockerfile.scanbuild
  • +2 -2
    Dockerfile.ubuntu-xenial-amd64
  • +1 -1
    Dockerfile.ubuntu-zesty-amd64
  • +16 -1
    convey.yml
  • +26 -0
    scanbuild/build.sh
    • --- /dev/null Thu Jan 01 00:00:00 1970 +0000
    +++ b/Dockerfile.scanbuild Sun Oct 22 22:47:23 2017 -0500
    @@ -0,0 +1,12 @@
    +FROM gplugin/builders:debian-buster-amd64
    +
    +MAINTAINER Gary Kramlich <grim@reaperworld.com>
    +
    +RUN set -ex && \
    + apt-get update && \
    + apt-get install -y --no-install-recommends clang && \
    + apt-get clean && \
    + rm -rf /var/lib/apt/lists
    +
    +COPY scanbuild/build.sh /
    +
    --- a/Dockerfile.ubuntu-xenial-amd64 Sat Oct 21 13:45:39 2017 -0500
    +++ b/Dockerfile.ubuntu-xenial-amd64 Sun Oct 22 22:47:23 2017 -0500
    @@ -15,7 +15,7 @@
    apt-get update && \
    apt-get install -y --no-install-recommends \
    ca-certificates unzip devscripts fakeroot debhelper \
    - build-essential ninja gettext help2man xsltproc mercurial \
    + build-essential meson gettext help2man xsltproc mercurial \
    libglib2.0-dev gobject-introspection libgirepository1.0-dev libgtk-3-dev \
    python3-dev python-gi-dev python3-gi \
    liblua5.1-0-dev lua-lgi luarocks \
    @@ -28,7 +28,7 @@
    CMD ["/build.sh"]
    -ENV DISTRIBUTION=testing \
    +ENV DISTRIBUTION=xenial \
    ARCH=amd64
    COPY debian/build.sh /build.sh
    --- a/Dockerfile.ubuntu-zesty-amd64 Sat Oct 21 13:45:39 2017 -0500
    +++ b/Dockerfile.ubuntu-zesty-amd64 Sun Oct 22 22:47:23 2017 -0500
    @@ -28,7 +28,7 @@
    CMD ["/build.sh"]
    -ENV DISTRIBUTION=testing \
    +ENV DISTRIBUTION=zesty \
    ARCH=amd64
    COPY debian/build.sh /build.sh
    --- a/convey.yml Sat Oct 21 13:45:39 2017 -0500
    +++ b/convey.yml Sun Oct 22 22:47:23 2017 -0500
    @@ -79,6 +79,12 @@
    files:
    - osx
    + scanbuild:
    + type: build
    + dockerfile: Dockerfile.scanbuild
    + tag: gplugin/builders:scanbuild
    + files: scanbuild
    +
    ubuntu-trusty-amd64:
    type: build
    dockerfile: Dockerfile.ubuntu-trusty-amd64
    @@ -153,6 +159,15 @@
    concurrent: true
    tasks:
    - opensuse-tumbleweed-amd64
    +
    + scanbuild:
    + stages:
    + - name: import
    + tasks:
    + - import
    + - name: build
    + tasks: scanbuild
    +
    ubuntu:
    stages:
    - name: import
    @@ -161,7 +176,7 @@
    - name: build
    concurrent: true
    tasks:
    - - ubuntu-trusty-amd64
    +# - ubuntu-trusty-amd64
    - ubuntu-xenial-amd64
    - ubuntu-zesty-amd64
    windows:
    --- /dev/null Thu Jan 01 00:00:00 1970 +0000
    +++ b/scanbuild/build.sh Sun Oct 22 22:47:23 2017 -0500
    @@ -0,0 +1,26 @@
    +#!/bin/sh -ex
    +# Copyright (C) 2015-2016 Gary Kramlich <grim@reaperworld.com>
    +#
    +# This program is free software; you can redistribute it and/or modify
    +# it under the terms of the GNU General Public License as published by
    +# the Free Software Foundation; either version 3 of the License, or
    +# (at your option) any later version.
    +#
    +# This program is distributed in the hope that it will be useful,
    +# but WITHOUT ANY WARRANTY; without even the implied warranty of
    +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
    +# GNU General Public License for more details.
    +#
    +# You should have received a copy of the GNU General Public License
    +# along with this program; if not, write to the Free Software Foundation,
    +# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
    +
    +cd ${CONVEY_WORKSPACE}
    +
    +BUILD_DIR="build-scanbuild"
    +
    +meson ${BUILD_DIR}
    +ninja -C ${BUILD_DIR} scan-build
    +
    +cp -a ${BUILD_DIR}/meson-logs/scanbuild ${CONVEY_WORKSPACE}
    +