Skip to content

Commit

Permalink
Circleci project setup (#310) Closes #311
Browse files Browse the repository at this point in the history
Moved to CircleCI
  • Loading branch information
cinemast authored Oct 23, 2021
1 parent 180b8cf commit 2db84e7
Show file tree
Hide file tree
Showing 22 changed files with 127 additions and 305 deletions.
62 changes: 62 additions & 0 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
version: 2.1
orbs:
codecov: codecov/[email protected]
jobs:
build-debian-gcc:
docker:
- image: "debian:latest"
steps:
- checkout
- run:
name: Installing Dependencies
command: ./docker/deps-debian.sh
- run:
name: Build test and install
command: 'OS=debian ./docker/build_test_install.sh'
- run:
name: Create coverage report
command: lcov --directory . --capture --output-file coverage.info && lcov --remove coverage.info '/usr/*' --output-file coverage.info
- codecov/upload:
file: coverage.info

build-fedora-gcc:
docker:
- image: "fedora:latest"
steps:
- checkout
- run:
name: Installing Dependencies
command: ./docker/deps-fedora.sh
- run:
name: Build test and install
command: 'OS=fedora ./docker/build_test_install.sh'
build-archlinux-gcc:
docker:
- image: "archlinux:latest"
steps:
- checkout
- run:
name: Installing Dependencies
command: ./docker/deps-archlinux.sh
- run:
name: Build test and install
command: 'OS=archlinux ./docker/build_test_install.sh'
build-osx-clang:
macos:
xcode: "13.0.0"
steps:
- checkout
- run:
name: Installing CMake
command: 'brew install cmake jsoncpp argtable curl hiredis redis libmicrohttpd'
- run:
name: Build
command: 'OS=osx ./docker/build_test_install.sh'
workflows:
version: 2
build:
jobs:
- build-debian-gcc
- build-fedora-gcc
- build-archlinux-gcc
- build-osx-clang
1 change: 1 addition & 0 deletions .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
.DS_Store
profile

cmake-build-*
# xcode noise
build/*
*.mode1
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ xcuserdata

#Qt-creator noise
build-*
cmake-build-*

# svn & cvs
.svn
Expand Down
33 changes: 0 additions & 33 deletions .travis.yml

This file was deleted.

3 changes: 0 additions & 3 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@ build:
mkdir -p build
cd build && cmake -DCMAKE_BUILD_TYPE=Debug -DWITH_COVERAGE=Yes .. && make -j$(nproc)

build-docker:
cd docker && make all

coverage: test
mkdir -p reports
gcovr -r . -d -e "build" -e "src/test" -e "src/examples" -e "src/stubgenerator/main.cpp" --html --html-details -o reports/coverage.html
Expand Down
9 changes: 5 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
**I am currently working on a new C++17 implementation -> [json-rpc-cxx](https://github.com/jsonrpcx/json-rpc-cxx).**
**I created a new C++17 header only implementation -> [json-rpc-cxx](https://github.com/jsonrpcx/json-rpc-cxx).**

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)
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)
[![codecov](https://codecov.io/gh/cinemast/libjson-rpc-cpp/branch/master/graph/badge.svg?token=QNoXsaI2ta)](https://codecov.io/gh/cinemast/libjson-rpc-cpp)

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)
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) |
[![Coverity Status](https://scan.coverity.com/projects/3169/badge.svg?flat=1)](https://scan.coverity.com/projects/3169)

libjson-rpc-cpp
===============
Expand Down
8 changes: 0 additions & 8 deletions dev/codecov.sh

This file was deleted.

83 changes: 0 additions & 83 deletions dev/source-ship.py

This file was deleted.

26 changes: 5 additions & 21 deletions docker/ArchLinux.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,26 +1,10 @@
FROM archlinux/base:latest
FROM archlinux:latest
MAINTAINER Peter Spiess-Knafl <[email protected]>
ENV OS=arch
RUN pacman -Sy --noconfirm \
sudo \
sed \
grep \
awk \
fakeroot \
wget \
cmake \
make \
gcc \
git \
jsoncpp \
libmicrohttpd \
curl \
hiredis \
redis

RUN sudo -u nobody mkdir /tmp/argtable && cd /tmp && git clone https://aur.archlinux.org/argtable.git && cd argtable && sudo -u nobody makepkg
RUN pacman -U --noconfirm /tmp/argtable/*.pkg.tar.xz
ENV OS=archlinux
RUN mkdir /app
COPY docker/deps-archlinux.sh /app
RUN chmod a+x /app/deps-archlinux.sh
RUN /app/deps-archlinux.sh
COPY docker/build_test_install.sh /app
COPY . /app
RUN chmod a+x /app/build_test_install.sh
Expand Down
14 changes: 0 additions & 14 deletions docker/Centos7.Dockerfile

This file was deleted.

11 changes: 11 additions & 0 deletions docker/Debian.Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
FROM debian:latest
MAINTAINER Peter Spiess-Knafl <[email protected]>
ENV OS=debian
RUN mkdir /app
COPY docker/deps-debian.sh /app
RUN chmod a+x /app/deps-debian.sh
RUN /app/deps-debian.sh
COPY docker/build_test_install.sh /app
COPY . /app
RUN chmod a+x /app/build_test_install.sh
RUN cd /app && ./build_test_install.sh
20 changes: 0 additions & 20 deletions docker/Debian10.Dockerfile

This file was deleted.

20 changes: 0 additions & 20 deletions docker/Debian8.Dockerfile

This file was deleted.

20 changes: 0 additions & 20 deletions docker/Debian9.Dockerfile

This file was deleted.

16 changes: 3 additions & 13 deletions docker/Fedora.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,20 +1,10 @@
FROM fedora:latest
MAINTAINER Peter Spiess-Knafl <[email protected]>
ENV OS=fedora
RUN dnf -y install \
gcc-c++ \
jsoncpp-devel \
libcurl-devel \
libmicrohttpd-devel \
catch-devel \
git \
cmake \
make \
argtable-devel \
hiredis-devel \
redis

RUN mkdir /app
COPY docker/deps-fedora.sh /app
RUN chmod a+x /app/deps-fedora.sh
RUN /app/deps-fedora.sh
COPY docker/build_test_install.sh /app
COPY . /app
RUN chmod a+x /app/build_test_install.sh
Expand Down
Loading

0 comments on commit 2db84e7

Please sign in to comment.