Skip to content

Commit

Permalink
Use Houston CI (#79)
Browse files Browse the repository at this point in the history
* Use Houston CI

* Use the right name

* Remove tests, update debian packaging
  • Loading branch information
danirabbit authored Jun 28, 2018
1 parent 2a787e5 commit 5c27a30
Show file tree
Hide file tree
Showing 5 changed files with 35 additions and 41 deletions.
40 changes: 31 additions & 9 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -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

4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`

Expand Down
13 changes: 0 additions & 13 deletions data/meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -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')]
)
4 changes: 2 additions & 2 deletions debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ Source: com.github.danrabbit.nimbus
Section: x11
Priority: extra
Maintainer: Daniel Foré <[email protected]>
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
Expand Down
15 changes: 0 additions & 15 deletions debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -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

0 comments on commit 5c27a30

Please sign in to comment.