From 48f2d97ab896474b527da7d824dc0f8512ea6717 Mon Sep 17 00:00:00 2001 From: Valient Gough Date: Thu, 18 Jun 2015 22:23:22 -0700 Subject: [PATCH 1/3] add circle.yml --- ci/config.sh | 5 +++++ ci/install-cmake.sh | 7 +++++++ ci/install-gcc.sh | 5 +++++ circle.yml | 18 ++++++++++++++++++ 4 files changed, 35 insertions(+) create mode 100755 ci/config.sh create mode 100755 ci/install-cmake.sh create mode 100755 ci/install-gcc.sh create mode 100644 circle.yml diff --git a/ci/config.sh b/ci/config.sh new file mode 100755 index 0000000..271d839 --- /dev/null +++ b/ci/config.sh @@ -0,0 +1,5 @@ +set -x +set -e +mkdir build +cd build +../ci/cmake/bin/cmake -DCMAKE_INSTALL_PREFIX:PATH=/tmp/encfs -DCMAKE_BUILD_TYPE=Debug .. diff --git a/ci/install-cmake.sh b/ci/install-cmake.sh new file mode 100755 index 0000000..6d83860 --- /dev/null +++ b/ci/install-cmake.sh @@ -0,0 +1,7 @@ +set -x +set -e +if [ ! -e ci/cmake/bin/cmake ]; then + wget http://www.cmake.org/files/v3.1/cmake-3.1.3-Linux-x86_64.tar.gz + tar -xzf cmake-3.1.3-Linux-x86_64.tar.gz + mv cmake-3.1.3-Linux-x86_64 ci/cmake +fi diff --git a/ci/install-gcc.sh b/ci/install-gcc.sh new file mode 100755 index 0000000..c147819 --- /dev/null +++ b/ci/install-gcc.sh @@ -0,0 +1,5 @@ +set -x +set -e +sudo apt-get install -y gcc-4.8 g++-4.8 +sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.8 100 +sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.8 100 diff --git a/circle.yml b/circle.yml new file mode 100644 index 0000000..1a3b60c --- /dev/null +++ b/circle.yml @@ -0,0 +1,18 @@ +machine: + timezone: + America/Los_Angeles + +dependencies: + pre: + - sudo apt-get update + - sudo apt-get install cmake libfuse-dev librlog-dev libgettextpo-dev + - bash ./ci/install-gcc.sh + - bash ./ci/install-cmake.sh + cache_directories: + - "ci/cmake" + +test: + override: + - bash ./ci/config.sh + - cd build && make && make test && make install + - /tmp/encfs/bin/encfsctl --version From 6e4e36cfbe952b626819ef087424fb092b095c19 Mon Sep 17 00:00:00 2001 From: Valient Gough Date: Thu, 18 Jun 2015 23:56:56 -0700 Subject: [PATCH 2/3] add circle to build status --- README.md | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 7eba84c..bdaaa6c 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,8 @@ # EncFS - an Encrypted Filesystem -[![Build Status](http://104.236.164.205:8080/api/badge/github.com/vgough/encfs/status.svg?branch=master)](http://104.236.164.205:8080/github.com/vgough/encfs) +_Build Status_ + - Drone: [![Build Status](http://104.236.164.205:8080/api/badge/github.com/vgough/encfs/status.svg?branch=master)](http://104.236.164.205:8080/github.com/vgough/encfs) + - Circle: [![Circle CI](https://circleci.com/gh/vgough/encfs.svg?style=svg)](https://circleci.com/gh/vgough/encfs) ## About From d5506e6d4be87c84d541f112723238a34dd35102 Mon Sep 17 00:00:00 2001 From: Valient Gough Date: Thu, 18 Jun 2015 23:59:05 -0700 Subject: [PATCH 3/3] add encfsctl check to drone build --- .drone.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.drone.yml b/.drone.yml index 181c2d0..4baf44b 100644 --- a/.drone.yml +++ b/.drone.yml @@ -1,7 +1,8 @@ image: encfs_worker script: - - sh devmode -DCMAKE_INSTALL_PREFIX:PATH=/tmp/cmake + - sh devmode -DCMAKE_INSTALL_PREFIX:PATH=/tmp/encfs - cd build - make - make test - make install + - /tmp/encfs/bin/encfsctl --version