Merge pull request #22 from jeremypw/travis-houston

Use houston ci and separate packaging.
jeremypw · Aug 27, 2018 · a1c7b02 · a1c7b02
2 parents 5b6ad8c + 65ecabe
commit a1c7b02
Show file tree

Hide file tree

Showing 4 changed files with 65 additions and 18 deletions.
diff --git a/.gitignore b/.gitignore
@@ -34,10 +34,9 @@
 
 # Build files
 *build/*
-debian/build/*
-debian/com.github*
-debian/*debhelper*
-debian/files
+
+# Packaging files (now in orphan branch)
+debian/*
 
 #Misc untracked
 untracked/*
diff --git a/.travis.yml b/.travis.yml
@@ -1,16 +1,34 @@
-language: generic
+---
+
+language: node_js
+
+node_js:
+  - lts/*
+
+sudo: required
 
 services:
- - docker
+  - docker
+
+addons:
+  apt:
+    sources:
+      - ubuntu-toolchain-r-test
+    packages:
+      - libstdc++-5-dev
+
+cache:
+  directories:
+    - /tmp/liftoff
 
-env:
- - DEPENDENCY_PACKAGES="meson appstream desktop-file-utils libgee-0.8-dev libgranite-dev libgtk-3-dev valac"
+matrix:
+  include:
+    - env: DIST=juno
+    - env: DIST=loki
 
 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 release-build --prefix=/usr  --buildtype=release && cd release-build && ninja"
- - 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 release-build && meson release-build --prefix=/usr  --buildtype=release && cd release-build && ninja"
+  - npm install @elementaryos/houston
 
 script:
- - echo BUILDS PASSED
+  - houston ci
+    --distribution $DIST
diff --git a/data/com.github.jeremypw.gnonograms.meson.in.appdata.xml b/data/com.github.jeremypw.gnonograms.meson.in.appdata.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <component type="desktop">
-    <id>com.github.jeremypw.gnonograms.desktop</id>
+    <id>com.github.jeremypw.gnonograms</id>
     <metadata_license>CC-BY-SA-3.0</metadata_license>
     <project_group>jeremypw</project_group>
     <project_license>GPL-3.0+</project_license>
@@ -10,14 +10,44 @@
     </mimetypes>
     <summary>Create and solve gnonogram puzzles</summary>
     <description>
-        <p>An implementation of the Japanese logic puzzle "Nonograms"</p>
-        <p>
+        <p>An implementation of the Japanese logic puzzle "Nonograms" written in Vala, allowing the user to:
             <ul>
                 <li>Draw puzzles</li>
                 <li>Generate random puzzles of chosen difficulty</li>
             </ul>
         </p>
     </description>
+    <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-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="drugs-narcotics">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="money-purchasing">none</content_attribute>
+        <content_attribute id="money-gambling">none</content_attribute>
+        <content_attribute id="social-chat">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="social-purchasing">none</content_attribute>
+        <content_attribute id="social-gambling">none</content_attribute>
+        <content_attribute id="social-info">none</content_attribute>
+    </content_rating>
     <categories>
         <category>Game</category>
         <category>LogicGame</category>
@@ -153,7 +183,7 @@
         </screenshot>
     </screenshots>
 
-    <developer_name>Jeremy P Wootten</developer_name>
+    <developer_name>Jeremy Paul Wootten</developer_name>
     <url type="homepage">https://github.com/jeremypw/gnonograms</url>
     <url type="bugtracker">https://github.com/jeremypw/gnonograms/issues</url>
     <url type="help">https://github.com/jeremypw/gnonograms</url>

diff --git a/data/meson.build b/data/meson.build
@@ -27,7 +27,7 @@ test (
 test (
     'Validate appdata file',
     find_program ('appstreamcli'),
-    args: ['validate', join_paths (meson.current_build_dir (), meson.project_name () + '.appdata.xml')]
+    args: ['validate', '--pedantic', join_paths (meson.current_build_dir (), meson.project_name () + '.appdata.xml')]
 )
 
 test (