Skip to content

Commit 5c27a30

Browse files
authored
Use Houston CI (#79)
* Use Houston CI * Use the right name * Remove tests, update debian packaging
1 parent 2a787e5 commit 5c27a30

File tree

5 files changed

+35
-41
lines changed

5 files changed

+35
-41
lines changed

.travis.yml

Lines changed: 31 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,38 @@
1-
language: generic
1+
---
2+
3+
language: node_js
4+
5+
node_js:
6+
- lts/*
7+
8+
sudo: required
29

310
services:
4-
- docker
11+
- docker
12+
13+
addons:
14+
apt:
15+
sources:
16+
- ubuntu-toolchain-r-test
17+
packages:
18+
- libstdc++-5-dev
519

6-
env:
7-
- DEPENDENCY_PACKAGES="appstream desktop-file-utils meson libgeoclue-2-dev libgtk-3-dev libgweather-3-dev libgee-0.8-dev valac"
20+
cache:
21+
directories:
22+
- /tmp/liftoff
23+
24+
matrix:
25+
include:
26+
- env: DIST=juno
27+
28+
before_install:
29+
- docker pull ubuntu:18.04
830

931
install:
10-
- docker pull elementary/docker:loki
11-
- 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"
12-
- docker pull elementary/docker:loki-unstable
13-
- 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"
32+
- npm install @elementaryos/houston@1
1433

1534
script:
16-
- echo BUILDS PASSED
35+
- houston ci
36+
--name-human Nimbus
37+
--distribution $DIST
38+

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@ You'll need the following dependencies to build:
1818
You'll need the following dependencies to run:
1919
* geoclue-2.0
2020

21-
Run `meson build` to configure the build environment and run `ninja test` to build and run automated tests
21+
Run `meson build` to configure the build environment and run `ninja test` to build
2222

2323
meson build --prefix=/usr
2424
cd build
25-
ninja test
25+
ninja
2626

2727
To install, use `ninja install`, then execute with `com.github.danrabbit.nimbus`
2828

data/meson.build

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,3 @@ i18n.merge_file(
3232
install: true,
3333
install_dir: join_paths(get_option('datadir'), 'metainfo')
3434
)
35-
36-
37-
test (
38-
'Validate desktop file',
39-
find_program('desktop-file-validate'),
40-
args: join_paths(meson.current_build_dir (), meson.project_name() + '.desktop')
41-
)
42-
43-
test (
44-
'Validate appdata file',
45-
find_program('appstreamcli'),
46-
args: ['validate', join_paths(meson.current_build_dir (), meson.project_name() + '.appdata.xml')]
47-
)

debian/control

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ Source: com.github.danrabbit.nimbus
22
Section: x11
33
Priority: extra
44
Maintainer: Daniel Foré <[email protected]>
5-
Build-Depends: debhelper (>= 9),
5+
Build-Depends: debhelper (>= 10.5.1),
66
libgeoclue-2-dev,
77
libgtk-3-dev,
88
libgweather-3-dev,
99
meson,
1010
valac
11-
Standards-Version: 3.9.3
11+
Standards-Version: 4.1.1
1212

1313
Package: com.github.danrabbit.nimbus
1414
Architecture: any

debian/rules

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,18 +12,3 @@
1212
%:
1313
dh $@
1414

15-
override_dh_auto_clean:
16-
rm -rf debian/build
17-
18-
override_dh_auto_configure:
19-
mkdir -p debian/build
20-
cd debian/build && meson --prefix=/usr ../..
21-
22-
override_dh_auto_build:
23-
cd debian/build && ninja -v
24-
25-
override_dh_auto_test:
26-
cd debian/build && ninja test
27-
28-
override_dh_auto_install:
29-
cd debian/build && DESTDIR=${CURDIR}/debian/com.github.danrabbit.nimbus ninja install

0 commit comments

Comments
 (0)