Browse Source

update CI build

sisyphus
Dustin Falgout 8 years ago
parent
commit
fb761c7e65
  1. 18
      build/ci/Dockerfile
  2. 8
      circle.yml

18
build/ci/Dockerfile

@ -1,14 +1,14 @@
FROM ubuntu:16.10 FROM ubuntu:17.04
MAINTAINER Antergos Developers <dev@antergos.com> MAINTAINER Antergos Linux Project <dev@antergos.com>
RUN DEBIAN_FRONTEND=noninteractive apt-get update; \ RUN DEBIAN_FRONTEND=noninteractive apt-get update \
apt-get install -y \ && apt-get install -y \
libgtk-3-dev \
liblightdm-gobject-1-dev \ liblightdm-gobject-1-dev \
libdbus-glib-1-dev \ libqt5webengine5 \
libwebkit2gtk-4.0-dev \ python3-gi \
ninja-build \ python3-pyqt5 \
python3-pip; pip3 install https://github.com/mesonbuild/meson/archive/master.zip python3-pip \
&& pip3 install whither
VOLUME /build VOLUME /build
WORKDIR /build WORKDIR /build

8
circle.yml

@ -7,10 +7,10 @@ dependencies:
cache_directories: cache_directories:
- ~/docker - ~/docker
override: override:
- '[[ -e ~/docker/image.tar ]] && docker load -i ~/docker/image.tar || true' - '[[ -e ~/docker/image1.tar ]] && docker load -i ~/docker/image1.tar || true'
- '[[ -e ~/docker/image.tar ]] || docker build --rm=false -t antergos/ci-ubuntu build/ci' - '[[ -e ~/docker/image1.tar ]] || docker build --rm=false -t antergos/ci-ubuntu build/ci'
- '[[ -e ~/docker/image.tar ]] || mkdir -p ~/docker; docker save antergos/ci-ubuntu > ~/docker/image.tar' - '[[ -e ~/docker/image1.tar ]] || mkdir -p ~/docker; docker save antergos/ci-ubuntu > ~/docker/image1.tar'
test: test:
override: override:
- docker run -v ${PWD}:/build:rw antergos/ci-ubuntu /bin/bash -c "cd build && meson --prefix=/usr .. && ninja && ninja install" - docker run -v ${PWD}:/build:rw antergos/ci-ubuntu /bin/bash -c "make -j1 install"

Loading…
Cancel
Save