From 0a498177eec1a8de56f56e34190cf52221010d58 Mon Sep 17 00:00:00 2001 From: Ilia Udalov Date: Sun, 22 Jan 2017 01:33:35 +0300 Subject: [PATCH] Continuous integration with travis-ci --- .travis.yml | 7 +++++++ CMakeLists.txt | 2 +- README.md | 6 ++++-- ci.sh | 16 ++++++++++++++++ lua-tests/run_tests.lua | 2 +- 5 files changed, 29 insertions(+), 4 deletions(-) create mode 100644 .travis.yml create mode 100755 ci.sh diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 0000000..5e0df1e --- /dev/null +++ b/.travis.yml @@ -0,0 +1,7 @@ +language: cpp +dist: trusty +sudo: required +compiler: clang +os: osx +osx_image: xcode8.2 +script: ./ci.sh \ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index 33b54fd..125ba63 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -22,7 +22,7 @@ add_library(woofer SHARED ${SOURCES}) target_link_libraries(woofer -lpthread ${LUA_LIBRARY}) set(GENERAL "-std=c++14 -pthread") -set(ENABLE_WARNINGS "-Wall -Wextra -pedantic") +set(ENABLE_WARNINGS "-Wall -Wextra -pedantic -Werror") set(BUILD_FLAVOR "-O3 -UNDEBUG") set_target_properties(woofer PROPERTIES COMPILE_FLAGS "${ENABLE_WARNINGS} ${GENERAL} ${BUILD_FLAVOR}") diff --git a/README.md b/README.md index dd65f67..e9976e2 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,4 @@ -# Bevy -Pure threads for Lua +# Woofer +Threading library for Lua. Written in C++ with great help of [sol2](https://github.com/ThePhD/sol2). + +[![Build Status](https://travis-ci.org/loud-hound/woofer.svg?branch=master)](https://travis-ci.org/loud-hound/woofer) diff --git a/ci.sh b/ci.sh new file mode 100755 index 0000000..a6b68fb --- /dev/null +++ b/ci.sh @@ -0,0 +1,16 @@ +#!/bin/sh -e + +brew update && true +brew install lua cmake && true + +ROOT_DIR=$( cd $(dirname $0); pwd ) +WORK_DIR=$ROOT_DIR/build + +mkdir -p $WORK_DIR + +# build +(cd $WORK_DIR && cmake $ROOT_DIR && make -j4 all && make install) + +# run tests +(cd $WORK_DIR && ./tests) +(cd $ROOT_DIR/lua-tests && ./run_tests.lua) diff --git a/lua-tests/run_tests.lua b/lua-tests/run_tests.lua index 53ea882..9a4cbbc 100755 --- a/lua-tests/run_tests.lua +++ b/lua-tests/run_tests.lua @@ -1,4 +1,4 @@ -#!/usr/bin/lua +#!/usr/bin/env lua package.cpath = package.cpath .. ";../build/?.so;;../build/?.dylib" test = require "luaunit.luaunit"