gplugin/builders

Update the alpine-edge stuff

2017-10-10, Gary Kramlich
5f1f31eb12ec
Parents 4a028ace9f39
Children 4887f8b8b3ef
Update the alpine-edge stuff
3 files changed, 18 insertions(+), 12 deletions(-)
  • +6 -1
    Dockerfile.alpine-edge-amd64
  • +10 -11
    alpine/build.sh
  • +2 -0
    convey.yml
    • --- a/Dockerfile.alpine-edge-amd64 Tue Sep 26 22:09:49 2017 -0500
    +++ b/Dockerfile.alpine-edge-amd64 Tue Oct 10 22:02:42 2017 -0500
    @@ -1,5 +1,7 @@
    FROM alpine:edge
    +MAINTAINER Gary Kramlich <grim@reaperworld.com>
    +
    RUN set -ex && \
    echo http://dl-cdn.alpinelinux.org/alpine/edge/testing | tee -a /etc/apk/repositories
    @@ -8,10 +10,13 @@
    mercurial ca-certificates \
    meson ninja gcc libc-dev help2man libxslt \
    gobject-introspection-dev gobject-introspection-dev gtk+3.0-dev \
    + python3 python3-dev py-gobject3-dev py3-gobject3 \
    lua5.1-dev lua5.1-lgi
    CMD ["/build.sh"]
    -ENV ARTIACTS_DIR=/alpine-edge-amd64
    +ENV DISTRIBUTION=alpine \
    + VERSION=edge \
    + ARCH=amd64
    COPY alpine/build.sh /build.sh
    --- a/alpine/build.sh Tue Sep 26 22:09:49 2017 -0500
    +++ b/alpine/build.sh Tue Oct 10 22:02:42 2017 -0500
    @@ -1,4 +1,4 @@
    -#!/bin/sh
    +#!/bin/sh -ex
    # Copyright (C) 2015-2016 Gary Kramlich <grim@reaperworld.com>
    #
    # This program is free software; you can redistribute it and/or modify
    @@ -15,16 +15,15 @@
    # along with this program; if not, write to the Free Software Foundation,
    # Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
    -set -ex
    +cd ${CONVEY_WORKSPACE}
    -trap "chown -R ${UID}:${GID} /artifacts; exit" INT QUIT TERM EXIT
    -
    -hg clone -b ${BRANCH} ${REPO} gplugin
    -cd gplugin
    +BUILD_TRIPLET=${DISTRIBUTION}-${VERSION}-${ARCH}
    -mkdir build
    -cd build
    -cmake .. -DCMAKE_VERBOSE_MAKEFILE=on -DBUILD_PYTHON=off
    -make
    +ARTIFACTS_DIR=${CONVEY_WORKSPACE}/${BUILD_TRIPLET}
    +mkdir -p ${ARTIFACTS_DIR}
    -find -name "*-junit.xml" -exec cp {} /artifacts/ \;
    +BUILD_DIR="build-${BUILD_TRIPLET}"
    +
    +meson ${BUILD_DIR}
    +ninja -C ${BUILD_DIR}
    +ninja -C ${BUILD_DIR} test
    --- a/convey.yml Tue Sep 26 22:09:49 2017 -0500
    +++ b/convey.yml Tue Oct 10 22:02:42 2017 -0500
    @@ -3,6 +3,7 @@
    type: import
    files:
    - .
    +
    alpine-edge-amd64:
    type: build
    dockerfile: Dockerfile.alpine-edge-amd64
    @@ -11,6 +12,7 @@
    - alpine
    labels:
    - COMMIT=${HG_COMMIT}
    +
    coverity:
    type: build
    dockerfile: Dockerfile.coverity