Merge branch 'houston-ci'

Author: Bart Zaalberg

.travis.yml

@@ -1,12 +1,28 @@
-    sudo: required
-    language: generic
+---
 
-    services:
-    - docker
+language: node_js
 
-    script:
-    - wget -O- https://raw.githubusercontent.com/harisvsulaiman/element-build/master/script.sh | sh -
+node_js:
+- lts/*
 
-    branches:
-    except:
-        - /^debian\/\d/
+sudo: required
+
+services:
+- docker
+
+addons:
+  apt:
+    sources:
+    - ubuntu-toolchain-r-test
+    packages:
+    - libstdc++-5-dev
+
+cache:
+  directories:
+  - /tmp/liftoff
+
+install:
+- npm install @elementaryos/houston
+
+script:
+- houston ci

CMakeLists.txt

@@ -75,7 +75,7 @@
         src/ListBoxRow.vala
         src/ListBox.vala
         src/ConfigFileReader.vala
-        src/Constants.vala        
+        src/Constants.vala
         src/Bookmark.vala
         src/StackManager.vala
         src/Dialogs/Preferences.vala
@@ -133,11 +133,10 @@
     install (TARGETS ${EXEC_NAME3} RUNTIME DESTINATION bin)
     #add the data directory and activated the cmakelists in that folder
     add_subdirectory (data)
-    
+
     # add settings schema to pc and recomple all schemas
     include (GSettings)
     add_schema (data/com.github.bartzaalberg.bookmark-manager.gschema.xml)
-    
+
     # install the polkit action file
-    install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/com.github.bartzaalberg.bookmark-manager.pkexec.policy DESTINATION ${DATADIR}/applications/)
     install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/com.github.bartzaalberg.bookmark-manager.pkexec.policy DESTINATION /usr/share/polkit-1/actions/)

data/com.github.bartzaalberg.bookmark-manager.appdata.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Copyright 2018 Your Name <bartzaalberg@outlook.com> -->
 <component type="desktop">
-  <id>com.github.bartzaalberg.bookmark-manager.desktop</id>
+  <id>com.github.bartzaalberg.bookmark-manager</id>
   <metadata_license>CC0</metadata_license>
   <project_license>GPL-3.0+</project_license>
   <name>Bookmark Manager</name>