From 1c7c18ecde798a673c55bfe80bbc75fd547c3d3c Mon Sep 17 00:00:00 2001 From: Jeremy Wootten Date: Sun, 26 Aug 2018 12:58:38 +0100 Subject: [PATCH 1/9] Change travis.yml to use houston ci --- .travis.yml | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index e4d71d2..d81c062 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,16 +1,28 @@ -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="meson appstream desktop-file-utils libgee-0.8-dev libgranite-dev libgtk-3-dev valac" +cache: + directories: + - /tmp/liftoff 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 From 1877735f40169ffd599e6a74e95fca1ece664c9f Mon Sep 17 00:00:00 2001 From: Jeremy Wootten Date: Sun, 26 Aug 2018 13:50:59 +0100 Subject: [PATCH 2/9] Add OARS content rating --- data/com.github.jeremypw.gnonograms.meson.in.appdata.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/data/com.github.jeremypw.gnonograms.meson.in.appdata.xml b/data/com.github.jeremypw.gnonograms.meson.in.appdata.xml index ada7c10..07e3b17 100644 --- a/data/com.github.jeremypw.gnonograms.meson.in.appdata.xml +++ b/data/com.github.jeremypw.gnonograms.meson.in.appdata.xml @@ -18,6 +18,7 @@

+ Game LogicGame From 821d3dc18baa36e55f2302f6e1692ec6971e4381 Mon Sep 17 00:00:00 2001 From: Jeremy Wootten Date: Sun, 26 Aug 2018 13:52:13 +0100 Subject: [PATCH 3/9] Fix appdata id field --- data/com.github.jeremypw.gnonograms.meson.in.appdata.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/com.github.jeremypw.gnonograms.meson.in.appdata.xml b/data/com.github.jeremypw.gnonograms.meson.in.appdata.xml index 07e3b17..28c21f5 100644 --- a/data/com.github.jeremypw.gnonograms.meson.in.appdata.xml +++ b/data/com.github.jeremypw.gnonograms.meson.in.appdata.xml @@ -1,6 +1,6 @@ - com.github.jeremypw.gnonograms.desktop + com.github.jeremypw.gnonograms CC-BY-SA-3.0 jeremypw GPL-3.0+ From c9d20aef47186282ddb80cea4df00a375a298a86 Mon Sep 17 00:00:00 2001 From: Jeremy Wootten Date: Sun, 26 Aug 2018 17:53:24 +0100 Subject: [PATCH 4/9] Ignore debian folder --- .gitignore | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index 6859844..7b218de 100644 --- 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/* From 92588f37ef6d7d3927c5a00e953756b83d7394e6 Mon Sep 17 00:00:00 2001 From: Jeremy Wootten Date: Sun, 26 Aug 2018 19:00:13 +0100 Subject: [PATCH 5/9] Stop appdata validation failing with pedantic --- data/com.github.jeremypw.gnonograms.meson.in.appdata.xml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/data/com.github.jeremypw.gnonograms.meson.in.appdata.xml b/data/com.github.jeremypw.gnonograms.meson.in.appdata.xml index 28c21f5..993c6c7 100644 --- a/data/com.github.jeremypw.gnonograms.meson.in.appdata.xml +++ b/data/com.github.jeremypw.gnonograms.meson.in.appdata.xml @@ -10,7 +10,7 @@ ​ Create and solve gnonogram puzzles -

An implementation of the Japanese logic puzzle "Nonograms"

+

An implementation of the Japanese logic puzzle "Nonograms" written in Vala for elementaryos.

  • Draw puzzles
    • @@ -18,7 +18,9 @@

- + + none + Game LogicGame @@ -154,7 +156,7 @@ - Jeremy P Wootten + Jeremy Paul Wootten https://github.com/jeremypw/gnonograms https://github.com/jeremypw/gnonograms/issues https://github.com/jeremypw/gnonograms From 852e276494e218961ff4023b99871b1355d494c0 Mon Sep 17 00:00:00 2001 From: Jeremy Wootten Date: Mon, 27 Aug 2018 10:43:08 +0100 Subject: [PATCH 6/9] Specify env in travis.yml --- .travis.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.travis.yml b/.travis.yml index d81c062..01e0662 100644 --- a/.travis.yml +++ b/.travis.yml @@ -21,8 +21,14 @@ cache: directories: - /tmp/liftoff +matrix: + include: + - env: DIST=loki + - env: DIST=juno + install: - npm install @elementaryos/houston script: - houston ci + --distribution $DIST From 22c5671415193324bda8abc0f6f3c7243c480a1e Mon Sep 17 00:00:00 2001 From: Jeremy Wootten Date: Mon, 27 Aug 2018 11:13:47 +0100 Subject: [PATCH 7/9] Fix new appdata issues --- ...b.jeremypw.gnonograms.meson.in.appdata.xml | 30 +++++++++++++++++-- data/meson.build | 2 +- 2 files changed, 28 insertions(+), 4 deletions(-) diff --git a/data/com.github.jeremypw.gnonograms.meson.in.appdata.xml b/data/com.github.jeremypw.gnonograms.meson.in.appdata.xml index 993c6c7..603760d 100644 --- a/data/com.github.jeremypw.gnonograms.meson.in.appdata.xml +++ b/data/com.github.jeremypw.gnonograms.meson.in.appdata.xml @@ -10,8 +10,7 @@ ​ Create and solve gnonogram puzzles -

An implementation of the Japanese logic puzzle "Nonograms" written in Vala for elementaryos.

-

+

An implementation of the Japanese logic puzzle "Nonograms" written in Vala, allowing the user to:

  • Draw puzzles
  • Generate random puzzles of chosen difficulty
    • @@ -19,7 +18,32 @@

    - none + none + none + none + none + none + none + none + none + none + none + none + none + none + none + none + none + none + none + none + none + none + none + none + none + none + none Game diff --git a/data/meson.build b/data/meson.build index 4d00ef3..6b86736 100644 --- 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 ( From 615df129f1e638046b8e745fa1d4771ffab9bc18 Mon Sep 17 00:00:00 2001 From: Jeremy Wootten Date: Mon, 27 Aug 2018 11:47:58 +0100 Subject: [PATCH 8/9] Fix further missing tags; just Juno travis --- .travis.yml | 1 - data/com.github.jeremypw.gnonograms.meson.in.appdata.xml | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 01e0662..9bbcf42 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,7 +23,6 @@ cache: matrix: include: - - env: DIST=loki - env: DIST=juno install: diff --git a/data/com.github.jeremypw.gnonograms.meson.in.appdata.xml b/data/com.github.jeremypw.gnonograms.meson.in.appdata.xml index 603760d..e7515c5 100644 --- a/data/com.github.jeremypw.gnonograms.meson.in.appdata.xml +++ b/data/com.github.jeremypw.gnonograms.meson.in.appdata.xml @@ -25,6 +25,7 @@ none none none + none none none none @@ -37,6 +38,8 @@ none none none + none + none none none none From 65ecabef85cec3d687e078ec54b89f94645ecbd6 Mon Sep 17 00:00:00 2001 From: Jeremy Wootten Date: Mon, 27 Aug 2018 12:36:22 +0100 Subject: [PATCH 9/9] Add loki build to travis --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 9bbcf42..b8bc8d7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -24,6 +24,7 @@ cache: matrix: include: - env: DIST=juno + - env: DIST=loki install: - npm install @elementaryos/houston