Skip to content

Commit 2db84e7

Browse files
authored
Circleci project setup (#310) Closes #311
Moved to CircleCI
1 parent 180b8cf commit 2db84e7

22 files changed

+127
-305
lines changed

.circleci/config.yml

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
version: 2.1
2+
orbs:
3+
codecov: codecov/[email protected]
4+
jobs:
5+
build-debian-gcc:
6+
docker:
7+
- image: "debian:latest"
8+
steps:
9+
- checkout
10+
- run:
11+
name: Installing Dependencies
12+
command: ./docker/deps-debian.sh
13+
- run:
14+
name: Build test and install
15+
command: 'OS=debian ./docker/build_test_install.sh'
16+
- run:
17+
name: Create coverage report
18+
command: lcov --directory . --capture --output-file coverage.info && lcov --remove coverage.info '/usr/*' --output-file coverage.info
19+
- codecov/upload:
20+
file: coverage.info
21+
22+
build-fedora-gcc:
23+
docker:
24+
- image: "fedora:latest"
25+
steps:
26+
- checkout
27+
- run:
28+
name: Installing Dependencies
29+
command: ./docker/deps-fedora.sh
30+
- run:
31+
name: Build test and install
32+
command: 'OS=fedora ./docker/build_test_install.sh'
33+
build-archlinux-gcc:
34+
docker:
35+
- image: "archlinux:latest"
36+
steps:
37+
- checkout
38+
- run:
39+
name: Installing Dependencies
40+
command: ./docker/deps-archlinux.sh
41+
- run:
42+
name: Build test and install
43+
command: 'OS=archlinux ./docker/build_test_install.sh'
44+
build-osx-clang:
45+
macos:
46+
xcode: "13.0.0"
47+
steps:
48+
- checkout
49+
- run:
50+
name: Installing CMake
51+
command: 'brew install cmake jsoncpp argtable curl hiredis redis libmicrohttpd'
52+
- run:
53+
name: Build
54+
command: 'OS=osx ./docker/build_test_install.sh'
55+
workflows:
56+
version: 2
57+
build:
58+
jobs:
59+
- build-debian-gcc
60+
- build-fedora-gcc
61+
- build-archlinux-gcc
62+
- build-osx-clang

.dockerignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
.DS_Store
33
profile
44

5+
cmake-build-*
56
# xcode noise
67
build/*
78
*.mode1

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ xcuserdata
1616

1717
#Qt-creator noise
1818
build-*
19+
cmake-build-*
1920

2021
# svn & cvs
2122
.svn

.travis.yml

Lines changed: 0 additions & 33 deletions
This file was deleted.

Makefile

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@ build:
88
mkdir -p build
99
cd build && cmake -DCMAKE_BUILD_TYPE=Debug -DWITH_COVERAGE=Yes .. && make -j$(nproc)
1010

11-
build-docker:
12-
cd docker && make all
13-
1411
coverage: test
1512
mkdir -p reports
1613
gcovr -r . -d -e "build" -e "src/test" -e "src/examples" -e "src/stubgenerator/main.cpp" --html --html-details -o reports/coverage.html

README.md

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
1-
**I am currently working on a new C++17 implementation -> [json-rpc-cxx](https://github.com/jsonrpcx/json-rpc-cxx).**
1+
**I created a new C++17 header only implementation -> [json-rpc-cxx](https://github.com/jsonrpcx/json-rpc-cxx).**
2+
3+
Master [![CircleCI](https://circleci.com/gh/cinemast/libjson-rpc-cpp/tree/master.svg?style=svg)](https://circleci.com/gh/cinemast/libjson-rpc-cpp/tree/master)
4+
Develop [![CircleCI](https://circleci.com/gh/cinemast/libjson-rpc-cpp/tree/develop.svg?style=svg)](https://circleci.com/gh/cinemast/libjson-rpc-cpp/tree/develop)
5+
[![codecov](https://codecov.io/gh/cinemast/libjson-rpc-cpp/branch/master/graph/badge.svg?token=QNoXsaI2ta)](https://codecov.io/gh/cinemast/libjson-rpc-cpp)
26

3-
Master [![Build Status](https://travis-ci.org/cinemast/libjson-rpc-cpp.png?branch=master)](https://travis-ci.org/cinemast/libjson-rpc-cpp) [![codecov](https://codecov.io/gh/cinemast/libjson-rpc-cpp/branch/master/graph/badge.svg)](https://codecov.io/gh/cinemast/libjson-rpc-cpp)
4-
Develop [![Build Status](https://travis-ci.org/cinemast/libjson-rpc-cpp.png?branch=develop)](https://travis-ci.org/cinemast/libjson-rpc-cpp) [![codecov](https://codecov.io/gh/cinemast/libjson-rpc-cpp/branch/develop/graph/badge.svg)](https://codecov.io/gh/cinemast/libjson-rpc-cpp) |
5-
[![Coverity Status](https://scan.coverity.com/projects/3169/badge.svg?flat=1)](https://scan.coverity.com/projects/3169)
67

78
libjson-rpc-cpp
89
===============

dev/codecov.sh

Lines changed: 0 additions & 8 deletions
This file was deleted.

dev/source-ship.py

Lines changed: 0 additions & 83 deletions
This file was deleted.

docker/ArchLinux.Dockerfile

Lines changed: 5 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,10 @@
1-
FROM archlinux/base:latest
1+
FROM archlinux:latest
22
MAINTAINER Peter Spiess-Knafl <[email protected]>
3-
ENV OS=arch
4-
RUN pacman -Sy --noconfirm \
5-
sudo \
6-
sed \
7-
grep \
8-
awk \
9-
fakeroot \
10-
wget \
11-
cmake \
12-
make \
13-
gcc \
14-
git \
15-
jsoncpp \
16-
libmicrohttpd \
17-
curl \
18-
hiredis \
19-
redis
20-
21-
RUN sudo -u nobody mkdir /tmp/argtable && cd /tmp && git clone https://aur.archlinux.org/argtable.git && cd argtable && sudo -u nobody makepkg
22-
RUN pacman -U --noconfirm /tmp/argtable/*.pkg.tar.xz
3+
ENV OS=archlinux
234
RUN mkdir /app
5+
COPY docker/deps-archlinux.sh /app
6+
RUN chmod a+x /app/deps-archlinux.sh
7+
RUN /app/deps-archlinux.sh
248
COPY docker/build_test_install.sh /app
259
COPY . /app
2610
RUN chmod a+x /app/build_test_install.sh

docker/Centos7.Dockerfile

Lines changed: 0 additions & 14 deletions
This file was deleted.

docker/Debian.Dockerfile

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
FROM debian:latest
2+
MAINTAINER Peter Spiess-Knafl <[email protected]>
3+
ENV OS=debian
4+
RUN mkdir /app
5+
COPY docker/deps-debian.sh /app
6+
RUN chmod a+x /app/deps-debian.sh
7+
RUN /app/deps-debian.sh
8+
COPY docker/build_test_install.sh /app
9+
COPY . /app
10+
RUN chmod a+x /app/build_test_install.sh
11+
RUN cd /app && ./build_test_install.sh

docker/Debian10.Dockerfile

Lines changed: 0 additions & 20 deletions
This file was deleted.

docker/Debian8.Dockerfile

Lines changed: 0 additions & 20 deletions
This file was deleted.

docker/Debian9.Dockerfile

Lines changed: 0 additions & 20 deletions
This file was deleted.

docker/Fedora.Dockerfile

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,10 @@
11
FROM fedora:latest
22
MAINTAINER Peter Spiess-Knafl <[email protected]>
33
ENV OS=fedora
4-
RUN dnf -y install \
5-
gcc-c++ \
6-
jsoncpp-devel \
7-
libcurl-devel \
8-
libmicrohttpd-devel \
9-
catch-devel \
10-
git \
11-
cmake \
12-
make \
13-
argtable-devel \
14-
hiredis-devel \
15-
redis
16-
174
RUN mkdir /app
5+
COPY docker/deps-fedora.sh /app
6+
RUN chmod a+x /app/deps-fedora.sh
7+
RUN /app/deps-fedora.sh
188
COPY docker/build_test_install.sh /app
199
COPY . /app
2010
RUN chmod a+x /app/build_test_install.sh

0 commit comments

Comments
 (0)