aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRiccardo Spagni <ric@spagni.net>2016-11-08 22:33:52 +0200
committerRiccardo Spagni <ric@spagni.net>2016-11-08 22:33:52 +0200
commit04003fe8e2b6d133a6e477d9637cb331b97d8ca9 (patch)
treecd4e48e14b3450febb290a6e822e698533c398ad
parentMerge pull request #1276 (diff)
parentREADME: update coverity project number (diff)
downloadmonero-04003fe8e2b6d133a6e477d9637cb331b97d8ca9.tar.xz
Merge pull request #1284
bc9b498 README: update coverity project number (anonimal) 9d9ab38 README: update armv8 link, add more coverage types (anonimal) 6f7f21f README: update build matrix (distro and ordering) (anonimal) 6711b98 README: add Freenode custom webchat link (anonimal) b57d1e1 README: add build matrix like that in Kovri (anonimal) 38dc0bf README/Repo: remove Travis CI (anonimal)
-rw-r--r--.travis.yml120
-rw-r--r--README.md28
2 files changed, 24 insertions, 124 deletions
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index 3eb75bea7..000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,120 +0,0 @@
-sudo: required
-dist: trusty
-language: cpp
-
-matrix:
- include:
-
- #
- # Coveralls.io
- #
- - os: linux
- compiler: gcc
- addons:
- apt:
- packages:
- - build-essential
- - cmake
- - doxygen
- - g++
- - gcc
- - clang
- - graphviz
- - libdb++-dev
- - libdb-dev
- - libgtest-dev
- - libminiupnpc-dev
- - libssl-dev
- - libssl1.0.0
- - libunbound-dev
- - libunwind8-dev
- sources:
- - ubuntu-toolchain-r-test
- before_install:
- - sudo add-apt-repository -y ppa:kojoley/boost
- - sudo apt-get -q update
- - pip install --user cpp-coveralls
- install:
- - sudo apt-get -y install libboost-{chrono,program-options,date-time,thread,system,filesystem,regex,serialization}1.58{-dev,.0}
- env:
- # exclude long-running and failing tests (#895)
- - ARGS=" -E 'coretests|libwallet_api_tests' "
- script:
- - make -j2 coverage
- after_success:
- - travis_wait coveralls -e external -e tests -e cmake -e contrib -e translations -e utils --gcov-options '\-lp' &> /dev/null
-
- #
- # Monero release-all (gcc)
- #
- - os: linux
- compiler: gcc
- addons:
- apt:
- packages:
- - build-essential
- - cmake
- - doxygen
- - g++
- - gcc
- - clang
- - graphviz
- - libdb++-dev
- - libdb-dev
- - libgtest-dev
- - libminiupnpc-dev
- - libssl-dev
- - libssl1.0.0
- - libunbound-dev
- - libunwind8-dev
- sources:
- - ubuntu-toolchain-r-test
- before_install:
- - sudo add-apt-repository -y ppa:kojoley/boost
- - sudo apt-get -q update
- install:
- - sudo apt-get -y install libboost-{chrono,program-options,date-time,thread,system,filesystem,regex,serialization}1.58{-dev,.0}
- script:
- - make -j2 && HAVE_DOT=YES doxygen Doxyfile
-
- #
- # Monero release-all (clang)
- #
- - os: linux
- compiler: clang
- addons:
- apt:
- packages:
- - build-essential
- - cmake
- - doxygen
- - clang
- - graphviz
- - libdb++-dev
- - libdb-dev
- - libgtest-dev
- - libminiupnpc-dev
- - libssl-dev
- - libssl1.0.0
- - libunbound-dev
- - libunwind8-dev
- sources:
- - ubuntu-toolchain-r-test
- before_install:
- - sudo add-apt-repository -y ppa:kojoley/boost
- - sudo apt-get -q update
- install:
- - sudo apt-get -y install libboost-{chrono,program-options,date-time,thread,system,filesystem,regex,serialization}1.58{-dev,.0}
- script:
- - make -j2 && HAVE_DOT=YES doxygen Doxyfile
-
-notifications:
- email: false
- irc:
- on_success: change
- on_failure: change
- channels:
- - "chat.freenode.net#monero-bots"
- nick: monero
- template:
- - "%{result} | %{repository}#%{build_number} (%{commit} : %{author}) | Build details : %{build_url}"
diff --git a/README.md b/README.md
index 61f7da79d..a26ed07fc 100644
--- a/README.md
+++ b/README.md
@@ -2,16 +2,36 @@
Copyright (c) 2014-2016, The Monero Project
-[![Build Status](https://travis-ci.org/monero-project/monero.svg?branch=master)](https://travis-ci.org/monero-project/monero)
-[![Coverage Status](https://coveralls.io/repos/github/monero-project/monero/badge.svg?branch=master)](https://coveralls.io/github/monero-project/monero?branch=master)
-
## Development Resources
- Web: [getmonero.org](https://getmonero.org)
- Forum: [forum.getmonero.org](https://forum.getmonero.org)
- Mail: [dev@getmonero.org](mailto:dev@getmonero.org)
- GitHub: [https://github.com/monero-project/monero](https://github.com/monero-project/monero)
-- IRC: [#monero-dev on Freenode](irc://chat.freenode.net/#monero-dev)
+- IRC: [#monero-dev on Freenode](http://webchat.freenode.net/?randomnick=1&channels=%23monero-dev&prompt=1&uio=d4)
+
+## Build
+
+| Operating System | Processor | Status |
+| --------------------- | -------- |--------|
+| Ubuntu 16.04 | i686 | [![Ubuntu 16.04 i686](https://build.getmonero.org/png?builder=monero-static-ubuntu-i686)](https://build.getmonero.org/builders/monero-static-ubuntu-i686)
+| Ubuntu 16.04 | amd64 | [![Ubuntu 16.04 amd64](https://build.getmonero.org/png?builder=monero-static-ubuntu-amd64)](https://build.getmonero.org/builders/monero-static-ubuntu-amd64)
+| Ubuntu 16.04 | armv7 | [![Ubuntu 16.04 armv7](https://build.getmonero.org/png?builder=monero-static-ubuntu-arm7)](https://build.getmonero.org/builders/monero-static-ubuntu-arm7)
+| Debian Stable | armv8 | [![Debian armv8](https://build.getmonero.org/png?builder=monero-static-debian-armv8)](https://build.getmonero.org/builders/monero-static-debian-armv8)
+| OSX 10.10 | amd64 | [![OSX 10.10 amd64](https://build.getmonero.org/png?builder=monero-static-osx-10.10)](https://build.getmonero.org/builders/monero-static-osx-10.10)
+| OSX 10.11 | amd64 | [![OSX 10.11 amd64](https://build.getmonero.org/png?builder=monero-static-osx-10.11)](https://build.getmonero.org/builders/monero-static-osx-10.11)
+| OSX 10.12 | amd64 | [![OSX 10.12 amd64](https://build.getmonero.org/png?builder=monero-static-osx-10.12)](https://build.getmonero.org/builders/monero-static-osx-10.12)
+| FreeBSD 10.3 | amd64 | [![FreeBSD 10.3 amd64](https://build.getmonero.org/png?builder=monero-static-freebsd64)](https://build.getmonero.org/builders/monero-static-freebsd64)
+| Windows (MSYS2/MinGW) | i686 | [![Windows (MSYS2/MinGW) i686](https://build.getmonero.org/png?builder=monero-static-win32)](https://build.getmonero.org/builders/monero-static-win32)
+| Windows (MSYS2/MinGW) | amd64 | [![Windows (MSYS2/MinGW) amd64](https://build.getmonero.org/png?builder=monero-static-win64)](https://build.getmonero.org/builders/monero-static-win64)
+
+## Coverage
+
+| Type | Status |
+|-----------|--------|
+| Coverity | [![Coverity Status](https://scan.coverity.com/projects/9657/badge.svg)](https://scan.coverity.com/projects/9657/)
+| Coveralls | [![Coveralls Status](https://coveralls.io/repos/github/monero-project/monero/badge.svg?branch=master)](https://coveralls.io/github/monero-project/monero?branch=master)
+| License | [![License](https://img.shields.io/badge/license-BSD3-blue.svg)](https://opensource.org/licenses/BSD-3-Clause)
## Introduction