Use Houston CI (#29)

* Use Houston CI * Add oards, remove linter test that doesn't work
danirabbit · Jun 30, 2018 · e1b3460 · e1b3460
1 parent cdb8e08
commit e1b3460
Show file tree

Hide file tree

Showing 6 changed files with 62 additions and 45 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,14 +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 io.elementary.vala-lint meson libgtk-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:juno-unstable
- - 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"
+  - npm install @elementaryos/houston@1
 
 script:
- - echo BUILDS PASSED
+  - houston ci
+    --name-human Harvey
+    --distribution $DIST
+
diff --git a/data/com.github.danrabbit.harvey.appdata.xml.in b/data/com.github.danrabbit.harvey.appdata.xml.in
@@ -39,6 +39,35 @@
             <image>https://raw.githubusercontent.com/danrabbit/harvey/master/data/screenshot.png</image>
         </screenshot>
     </screenshots>
+  <content_rating type="oars-1.1">
+    <content_attribute id="violence-cartoon">none</content_attribute>
+    <content_attribute id="violence-fantasy">none</content_attribute>
+    <content_attribute id="violence-realistic">none</content_attribute>
+    <content_attribute id="violence-bloodshed">none</content_attribute>
+    <content_attribute id="violence-sexual">none</content_attribute>
+    <content_attribute id="violence-desecration">none</content_attribute>
+    <content_attribute id="violence-slavery">none</content_attribute>
+    <content_attribute id="violence-worship">none</content_attribute>
+    <content_attribute id="drugs-alcohol">none</content_attribute>
+    <content_attribute id="drugs-narcotics">none</content_attribute>
+    <content_attribute id="drugs-tobacco">none</content_attribute>
+    <content_attribute id="sex-nudity">none</content_attribute>
+    <content_attribute id="sex-themes">none</content_attribute>
+    <content_attribute id="sex-homosexuality">none</content_attribute>
+    <content_attribute id="sex-prostitution">none</content_attribute>
+    <content_attribute id="sex-adultery">none</content_attribute>
+    <content_attribute id="sex-appearance">none</content_attribute>
+    <content_attribute id="language-profanity">none</content_attribute>
+    <content_attribute id="language-humor">none</content_attribute>
+    <content_attribute id="language-discrimination">none</content_attribute>
+    <content_attribute id="social-chat">none</content_attribute>
+    <content_attribute id="social-info">none</content_attribute>
+    <content_attribute id="social-audio">none</content_attribute>
+    <content_attribute id="social-location">none</content_attribute>
+    <content_attribute id="social-contacts">none</content_attribute>
+    <content_attribute id="money-purchasing">none</content_attribute>
+    <content_attribute id="money-gambling">none</content_attribute>
+  </content_rating>
     <translation type="gettext">com.github.danrabbit.harvey</translation>
     <developer_name>Daniel Foré</developer_name>
     <url type="homepage">http://danielfore.com</url>

diff --git a/data/meson.build b/data/meson.build
@@ -33,16 +33,3 @@ i18n.merge_file(
     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
@@ -2,13 +2,11 @@ Source: com.github.danrabbit.harvey
 Section: x11
 Priority: extra
 Maintainer: Daniel Foré <daniel@elementary.io>
-Build-Depends: appstream,
-               debhelper (>= 9),
-               desktop-file-utils,
+Build-Depends: debhelper (>= 10.5.1),
                libgtk-3-dev,
                meson,
                valac
-Standards-Version: 3.9.3
+Standards-Version: 4.1.1
 
 Package: com.github.danrabbit.harvey
 Architecture: any

diff --git 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.harvey ninja install
diff --git a/meson.build b/meson.build
@@ -29,9 +29,3 @@ subdir('data')
 subdir('po')
 
 meson.add_install_script('meson/post_install.py')
-
-test (
-    'Vala lint',
-    find_program('io.elementary.vala-lint'),
-    args: ['-d', join_paths(meson.source_root(), 'src')]
-)