diff --git a/.travis.yml b/.travis.yml index e54b676..c1f363e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,16 +1,38 @@ -language: generic +--- + +language: node_js + +node_js: + - lts/* + +sudo: required services: - - docker + - docker + +addons: + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - libstdc++-5-dev -env: - - DEPENDENCY_PACKAGES="appstream desktop-file-utils meson libgeoclue-2-dev libgtk-3-dev libgweather-3-dev libgee-0.8-dev valac" +cache: + directories: + - /tmp/liftoff + +matrix: + include: + - env: DIST=juno + +before_install: + - docker pull ubuntu:18.04 install: - - docker pull elementary/docker:loki - - docker run -v "$PWD":/tmp/build-dir elementary/docker:loki /bin/sh -c "apt-get update && apt-get -y install $DEPENDENCY_PACKAGES && cd /tmp/build-dir && meson build --prefix=/usr && cd build && ninja test" - - docker pull elementary/docker:loki-unstable - - docker run -v "$PWD":/tmp/build-dir elementary/docker:loki-unstable /bin/sh -c "apt-get update && apt-get -y install $DEPENDENCY_PACKAGES && cd /tmp/build-dir && rm -rf build && meson build --prefix=/usr && cd build && ninja test" + - npm install @elementaryos/houston@1 script: - - echo BUILDS PASSED + - houston ci + --name-human Nimbus + --distribution $DIST + diff --git a/README.md b/README.md index 65363d0..ee96efb 100644 --- a/README.md +++ b/README.md @@ -18,11 +18,11 @@ You'll need the following dependencies to build: You'll need the following dependencies to run: * geoclue-2.0 -Run `meson build` to configure the build environment and run `ninja test` to build and run automated tests +Run `meson build` to configure the build environment and run `ninja test` to build meson build --prefix=/usr cd build - ninja test + ninja To install, use `ninja install`, then execute with `com.github.danrabbit.nimbus` diff --git a/data/meson.build b/data/meson.build index b54ee6e..15c91dd 100644 --- a/data/meson.build +++ b/data/meson.build @@ -32,16 +32,3 @@ i18n.merge_file( install: true, install_dir: join_paths(get_option('datadir'), 'metainfo') ) - - -test ( - 'Validate desktop file', - find_program('desktop-file-validate'), - args: join_paths(meson.current_build_dir (), meson.project_name() + '.desktop') -) - -test ( - 'Validate appdata file', - find_program('appstreamcli'), - args: ['validate', join_paths(meson.current_build_dir (), meson.project_name() + '.appdata.xml')] -) diff --git a/debian/control b/debian/control index 7bd8d2f..bdebdee 100644 --- a/debian/control +++ b/debian/control @@ -2,13 +2,13 @@ Source: com.github.danrabbit.nimbus Section: x11 Priority: extra Maintainer: Daniel Foré -Build-Depends: debhelper (>= 9), +Build-Depends: debhelper (>= 10.5.1), libgeoclue-2-dev, libgtk-3-dev, libgweather-3-dev, meson, valac -Standards-Version: 3.9.3 +Standards-Version: 4.1.1 Package: com.github.danrabbit.nimbus Architecture: any diff --git a/debian/rules b/debian/rules index fed027e..761c3f0 100755 --- a/debian/rules +++ b/debian/rules @@ -12,18 +12,3 @@ %: dh $@ -override_dh_auto_clean: - rm -rf debian/build - -override_dh_auto_configure: - mkdir -p debian/build - cd debian/build && meson --prefix=/usr ../.. - -override_dh_auto_build: - cd debian/build && ninja -v - -override_dh_auto_test: - cd debian/build && ninja test - -override_dh_auto_install: - cd debian/build && DESTDIR=${CURDIR}/debian/com.github.danrabbit.nimbus ninja install