travis: Update build script for meson

This commit is contained in:
Hylke Bons 2018-02-19 17:51:30 +00:00
parent 1a920a6ac7
commit 1852c6207c
2 changed files with 14 additions and 7 deletions

View file

@ -9,12 +9,12 @@ matrix:
sudo: required sudo: required
before_install: before_install:
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker pull ubuntu:xenial ; fi - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker pull ubuntu:17.10 ; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then wget https://dl.xamarin.com/XamarinforMac/Mac/xamarin.mac-3.0.0.393.pkg ; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then wget https://dl.xamarin.com/XamarinforMac/Mac/xamarin.mac-3.0.0.393.pkg ; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then sudo installer -pkg xamarin.mac*.pkg -target / ; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then sudo installer -pkg xamarin.mac*.pkg -target / ; fi
script: script:
- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker build --file build/ci/Dockerfile --tag sparkleshare:nightly . ; fi - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then docker build --file scripts/ci/Dockerfile --tag sparkleshare:nightly . ; fi
- if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then msbuild /p:Configuration=ReleaseMac SparkleShare.sln ; fi - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then msbuild /p:Configuration=ReleaseMac SparkleShare.sln ; fi
before_deploy: before_deploy:

View file

@ -1,11 +1,12 @@
FROM ubuntu:16.04 FROM ubuntu:17.10
RUN apt-get update RUN apt-get update
RUN apt-get install -y \ RUN apt-get install -y \
automake \
autoconf \
desktop-file-utils \ desktop-file-utils \
git \ git \
gtk-sharp3-gapi \ gtk-sharp3-gapi \
intltool \
libappindicator3-0.1-cil-dev \ libappindicator3-0.1-cil-dev \
libdbus-glib2.0-cil-dev \ libdbus-glib2.0-cil-dev \
libgtk3.0-cil-dev \ libgtk3.0-cil-dev \
@ -14,9 +15,12 @@ RUN apt-get install -y \
libwebkit2gtk-4.0 \ libwebkit2gtk-4.0 \
mono-devel \ mono-devel \
mono-mcs \ mono-mcs \
nant \ ninja-build \
python3-pip \
xsltproc xsltproc
RUN pip3 install meson
RUN git clone https://github.com/hbons/notify-sharp && \ RUN git clone https://github.com/hbons/notify-sharp && \
cd notify-sharp/ && \ cd notify-sharp/ && \
./autogen.sh --disable-docs && \ ./autogen.sh --disable-docs && \
@ -39,6 +43,9 @@ RUN git clone https://github.com/hbons/webkit2gtk-sharp && \
RUN cd ../ RUN cd ../
COPY ./ ./ COPY ./ ./
RUN ./autogen.sh && \ RUN mkdir build/
make && make install
RUN meson build/ && \
cd build/ && \
ninja && ninja install