Skip to content

Commit e1b3460

Browse files
danirabbitdanirabbit
authored
Use Houston CI (#29)
* Use Houston CI * Add oards, remove linter test that doesn't work
1 parent cdb8e08 commit e1b3460

File tree

6 files changed

+62
-45
lines changed

6 files changed

+62
-45
lines changed

‎.travis.yml‎

Lines changed: 31 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +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 io.elementary.vala-lint meson libgtk-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:juno-unstable
11-
- docker run -v "$PWD":/tmp/build-dir elementary/docker:juno-unstable /bin/sh -c "apt-get update && apt-get -y install $DEPENDENCY_PACKAGES && cd /tmp/build-dir && meson build --prefix=/usr && cd build && ninja test"
32+
- npm install @elementaryos/houston@1
1233

1334
script:
14-
- echo BUILDS PASSED
35+
- houston ci
36+
--name-human Harvey
37+
--distribution $DIST
38+

‎data/com.github.danrabbit.harvey.appdata.xml.in‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,35 @@
3939
<image>https://raw.githubusercontent.com/danrabbit/harvey/master/data/screenshot.png</image>
4040
</screenshot>
4141
</screenshots>
42+
<content_rating type="oars-1.1">
43+
<content_attribute id="violence-cartoon">none</content_attribute>
44+
<content_attribute id="violence-fantasy">none</content_attribute>
45+
<content_attribute id="violence-realistic">none</content_attribute>
46+
<content_attribute id="violence-bloodshed">none</content_attribute>
47+
<content_attribute id="violence-sexual">none</content_attribute>
48+
<content_attribute id="violence-desecration">none</content_attribute>
49+
<content_attribute id="violence-slavery">none</content_attribute>
50+
<content_attribute id="violence-worship">none</content_attribute>
51+
<content_attribute id="drugs-alcohol">none</content_attribute>
52+
<content_attribute id="drugs-narcotics">none</content_attribute>
53+
<content_attribute id="drugs-tobacco">none</content_attribute>
54+
<content_attribute id="sex-nudity">none</content_attribute>
55+
<content_attribute id="sex-themes">none</content_attribute>
56+
<content_attribute id="sex-homosexuality">none</content_attribute>
57+
<content_attribute id="sex-prostitution">none</content_attribute>
58+
<content_attribute id="sex-adultery">none</content_attribute>
59+
<content_attribute id="sex-appearance">none</content_attribute>
60+
<content_attribute id="language-profanity">none</content_attribute>
61+
<content_attribute id="language-humor">none</content_attribute>
62+
<content_attribute id="language-discrimination">none</content_attribute>
63+
<content_attribute id="social-chat">none</content_attribute>
64+
<content_attribute id="social-info">none</content_attribute>
65+
<content_attribute id="social-audio">none</content_attribute>
66+
<content_attribute id="social-location">none</content_attribute>
67+
<content_attribute id="social-contacts">none</content_attribute>
68+
<content_attribute id="money-purchasing">none</content_attribute>
69+
<content_attribute id="money-gambling">none</content_attribute>
70+
</content_rating>
4271
<translation type="gettext">com.github.danrabbit.harvey</translation>
4372
<developer_name>Daniel Foré</developer_name>
4473
<url type="homepage">http://danielfore.com</url>

‎data/meson.build‎

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,3 @@ i18n.merge_file(
3333
install_dir: join_paths(get_option('datadir'), 'metainfo')
3434
)
3535

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-
)
48-

‎debian/control‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,11 @@ Source: com.github.danrabbit.harvey
22
Section: x11
33
Priority: extra
44
Maintainer: Daniel Foré <[email protected]>
5-
Build-Depends: appstream,
6-
debhelper (>= 9),
7-
desktop-file-utils,
5+
Build-Depends: debhelper (>= 10.5.1),
86
libgtk-3-dev,
97
meson,
108
valac
11-
Standards-Version: 3.9.3
9+
Standards-Version: 4.1.1
1210

1311
Package: com.github.danrabbit.harvey
1412
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.harvey ninja install

‎meson.build‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,3 @@ subdir('data')
2929
subdir('po')
3030

3131
meson.add_install_script('meson/post_install.py')
32-
33-
test (
34-
'Vala lint',
35-
find_program('io.elementary.vala-lint'),
36-
args: ['-d', join_paths(meson.source_root(), 'src')]
37-
)

0 commit comments

Comments
 (0)