From cf15818616d896898348955e5aa2363ac21ac538 Mon Sep 17 00:00:00 2001 From: Bart Zaalberg Date: Thu, 13 Sep 2018 09:12:10 +0200 Subject: [PATCH] Added Houston CI to repository --- .travis.yml | 34 ++++++++++++++----- CMakeLists.txt | 11 +++--- ...github.bartzaalberg.snaptastic.appdata.xml | 2 +- 3 files changed, 31 insertions(+), 16 deletions(-) diff --git a/.travis.yml b/.travis.yml index 423da6e..52fc2d3 100644 --- a/.travis.yml +++ b/.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 diff --git a/CMakeLists.txt b/CMakeLists.txt index 0d293dc..e06802c 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -22,7 +22,7 @@ set (DEPS_PACKAGES gtk+-3.0 - granite + granite snapd-glib ) @@ -58,7 +58,7 @@ src/ListBox.vala src/ResponseTranslator.vala src/FileManager.vala - src/Constants.vala + src/Constants.vala src/Package.vala src/CommandHandler.vala src/SnapdHandler.vala @@ -77,7 +77,7 @@ # tell what libraries to use when compiling PACKAGES gtk+-3.0 - granite + granite snapd-glib ) @@ -89,7 +89,7 @@ install (TARGETS ${EXEC_NAME} RUNTIME DESTINATION bin) #------------------------------------------------------------------------------------------ - + # files we want to compile include(ValaPrecompile) vala_precompile(VALA_C ${EXEC_NAME2} @@ -109,7 +109,6 @@ #add the data directory and activated the cmakelists in that folder add_subdirectory (data) - + # install the polkit action file - install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/com.github.bartzaalberg.snaptastic.pkexec.policy DESTINATION ${DATADIR}/applications/) install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/com.github.bartzaalberg.snaptastic.pkexec.policy DESTINATION /usr/share/polkit-1/actions/) diff --git a/data/com.github.bartzaalberg.snaptastic.appdata.xml b/data/com.github.bartzaalberg.snaptastic.appdata.xml index 5860815..686682f 100644 --- a/data/com.github.bartzaalberg.snaptastic.appdata.xml +++ b/data/com.github.bartzaalberg.snaptastic.appdata.xml @@ -1,7 +1,7 @@ - com.github.bartzaalberg.snaptastic.desktop + com.github.bartzaalberg.snaptastic CC0 GPL-3.0+ Snaptastic