Skip to content

Commit

Permalink
Release candidate 1.0.0-rc.0
Browse files Browse the repository at this point in the history
  • Loading branch information
DimaStebaev authored Apr 25, 2019
2 parents 4148022 + 5e01533 commit aab9ac2
Show file tree
Hide file tree
Showing 13 changed files with 127 additions and 168 deletions.
26 changes: 3 additions & 23 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,29 +3,9 @@
*.gcda

# SkaleDeps specific
SkaleDeps/build
SkaleDeps/deps_inst
SkaleDeps/*.tar.gz
SkaleDeps/*.tar.xz
SkaleDeps/*.zip
SkaleDeps/saved_environment_on_startup.txt
SkaleDeps/saved_environment_pre_configured.txt
SkaleDeps/argtable2
SkaleDeps/boost_1_68_0
SkaleDeps/curl
SkaleDeps/libiconv-1.15
SkaleDeps/openssl
SkaleDeps/libuv
SkaleDeps/libwebsockets
SkaleDeps/zlib
SkaleDeps/nettle-2.0
SkaleDeps/nettle-3.4.1
SkaleDeps/libtasn1
SkaleDeps/gnutls-3.6.5
SkaleDeps/libmicrohttpd
SkaleDeps/jsoncpp
SkaleDeps/libjson-rpc-cpp
SkaleDeps/libcryptopp
SkaleDeps/*
!SkaleDeps/build.sh
!SkaleDeps/clean.sh

# Compiled Object files
*.slo
Expand Down
5 changes: 2 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@
branch = a4f7029371961b2ac4727e76eb721b86627a78d3
[submodule "libconsensus"]
path = libconsensus
url = [email protected]:skalelabs/skale-consensus.git
branch = develop
url = https://github.com/skalenetwork/skale-consensus.git
[submodule "test/jsontests"]
path = test/jsontests
url = git@github.com:skalenetwork/skaled-tests.git
url = https://github.com/skalenetwork/skaled-tests.git
119 changes: 83 additions & 36 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,28 +25,89 @@
language: cpp
env:
global:
- TRAVIS_TESTS=On
matrix:
- MATRIX_EVAL="CC=gcc-7 && CXX=g++-7"
- TARGET=all
os: linux
dist: xenial
addons:
apt:
sources:
- ubuntu-toolchain-r-test
packages:
- g++-7
- texinfo
- lcov
- clang-format-6.0
jobs:
include:
- os: linux
dist: xenial
addons:
apt:
sources:
- ubuntu-toolchain-r-test
packages:
- g++-7
- texinfo
- lcov
- clang-format-6.0
- libboost-all-dev
- libssl-dev
- stage: test
env:
- ZIP_SUFFIX=ubuntu-xenial
- CMAKE_BUILD_TYPE=Debug
- MATRIX_EVAL="CC=gcc-7 && CXX=g++-7"
git:
depth: 2
- CMAKE_BUILD_TYPE=Debug
- CODE_COVERAGE=ON
after_success:
# run tests
- cd test
- ./testeth
- cd ..

# Create lcov report
- lcov --capture --directory . --output-file coverage.info
- lcov --remove coverage.info '/usr/*' --output-file coverage.info # filter system-files
- lcov --remove coverage.info 'SkaleDeps/*' --output-file coverage.info # filter dependency files
- lcov --remove coverage.info '.hunter/*' --output-file coverage.info # filter dependency files
- lcov --list coverage.info # debug info

# Uploading report to CodeCov
- bash <(curl -s https://codecov.io/bash) -f coverage.info -t $CODECOV_TOKEN || echo "Codecov did not collect coverage reports"

- stage: deploy
if: branch IN (master, release-candidate)
env:
- CMAKE_BUILD_TYPE=Debug
- CODE_COVERAGE=OFF
- TARGET=skaled
after_success:
- cp skaled/skaled ../scripts/skale_build/executable/
- export VERSION=$(cat ../VERSION)
- export VERSION=$( (test $TRAVIS_BRANCH = "master" && echo $VERSION) || ../scripts/calculate_rc_version.sh $VERSION)
- echo "Version $VERSION"
- cd ../scripts/skale_build
- ./build_image.sh $VERSION
- cd ../../build
before_deploy:
# Set up git user name and tag this commit
- (
test ! $TRAVIS_TAG &&
git config --local user.name "skale-jenkins" &&
git config --local user.email "$GITHUB_EMAIL" &&
export TRAVIS_TAG=v$VERSION &&
git tag "$TRAVIS_TAG"
) || true
deploy:
- provider: releases
api_key: "$GITHUB_OAUTH_TOKEN"
skip_cleanup: true
file:
- skaled/skaled
on:
repo: skalenetwork/skaled
branch: master
- provider: releases
api_key: "$GITHUB_OAUTH_TOKEN"
skip_cleanup: true
prerelease: true
file:
- skaled/skaled
on:
repo: skalenetwork/skaled
branch: release-candidate
- provider: script
script: bash ../scripts/skale_build/deploy_image.sh $VERSION $DOCKER_USERNAME $DOCKER_PASSWORD
on:
repo: skalenetwork/skaled
branch:
- master
- release-candidate
cache:
ccache: true
directories:
Expand All @@ -66,24 +127,10 @@ script:
# configure
- mkdir -p build
- cd build
- cmake -DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE -DCOVERAGE=ON ..
- cmake -DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE -DCOVERAGE=$CODE_COVERAGE ..

# check code style
- make format-check || travis_terminate 1;

# build
- make -j$(nproc)

# run tests
- cd test
- ./testeth
- cd ..
after_success:
# Create lcov report
- lcov --capture --directory . --output-file coverage.info
- lcov --remove coverage.info '/usr/*' --output-file coverage.info # filter system-files
- lcov --remove coverage.info 'SkaleDeps/*' --output-file coverage.info # filter dependency files
- lcov --remove coverage.info '.hunter/*' --output-file coverage.info # filter dependency files
- lcov --list coverage.info # debug info
# Uploading report to CodeCov
- bash <(curl -s https://codecov.io/bash) -f coverage.info -t $CODECOV_TOKEN || echo "Codecov did not collect coverage reports"
- cmake --build . --target $TARGET -- -j$(nproc)
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,6 @@ Learn more about the SKALE community over on [Discord](https://discord.gg/vvUtWJ

All contributions are made under the [GNU General Public License v3](https://www.gnu.org/licenses/gpl-3.0.en.html). See [LICENSE](LICENSE).

All original cpp-ethereum code Copyright (C) Aleth Authors.
All cpp-ethereum modifications Copyright (C) SKALE Labs.
All original cpp-ethereum code Copyright (C) Aleth Authors.
All cpp-ethereum modifications Copyright (C) SKALE Labs.
All skaled code Copyright (C) SKALE Labs.
2 changes: 1 addition & 1 deletion libconsensus
Submodule libconsensus updated 56 files
+2 −2 .gitmodules
+2 −0 .idea/vcs.xml
+3 −1 CMakeLists.txt
+22 −27 Log.h
+41 −4 README.md
+22 −3 abstracttcpclient/AbstractClientAgent.cpp
+22 −3 abstracttcpclient/AbstractClientAgent.h
+23 −0 blockfinalize/client/BlockFinalizeClientAgent.cpp
+23 −0 blockfinalize/client/BlockFinalizeClientAgent.h
+23 −0 blockfinalize/client/BlockFinalizeClientThreadPool.cpp
+23 −0 blockfinalize/client/BlockFinalizeClientThreadPool.h
+23 −0 blockfinalize/received/ReceivedSigSharesDatabase.cpp
+23 −0 blockfinalize/received/ReceivedSigSharesDatabase.h
+23 −0 blockproposal/pusher/BlockProposalClientAgent.h
+4 −12 chains/Schain.cpp
+3 −6 chains/Schain.h
+75 −90 cmake/HunterGate.cmake
+43 −31 crypto/BLSPrivateKey.cpp
+26 −13 crypto/BLSPrivateKey.h
+34 −20 crypto/BLSPublicKey.cpp
+21 −3 crypto/BLSPublicKey.h
+22 −3 crypto/BLSSigShare.cpp
+34 −20 crypto/BLSSigShare.h
+22 −3 crypto/BLSSignature.cpp
+22 −3 crypto/BLSSignature.h
+22 −3 crypto/PartialSHAHash.cpp
+22 −3 crypto/PartialSHAHash.h
+21 −3 crypto/SHAHash.cpp
+22 −3 crypto/SHAHash.h
+22 −3 crypto/bls_include.h
+64 −44 datastructures/SigShareSet.cpp
+23 −0 datastructures/SigShareSet.h
+24 −3 db/LevelDB.cpp
+23 −3 db/LevelDB.h
+23 −0 exceptions/InvalidHashException.cpp
+23 −0 exceptions/InvalidHashException.h
+23 −0 exceptions/InvalidSchainIndexException.h
+23 −0 exceptions/LevelDBException.cpp
+23 −0 exceptions/LevelDBException.h
+23 −3 headers/AbstractBlockRequestHeader.cpp
+22 −3 headers/AbstractBlockRequestHeader.h
+22 −3 headers/BlockFinalizeRequestHeader.cpp
+23 −0 headers/BlockFinalizeRequestHeader.h
+22 −3 headers/BlockFinalizeResponseHeader.cpp
+23 −0 headers/BlockFinalizeResponseHeader.h
+1 −1 libBLS
+0 −87 pendingqueue/ExternalQueueSyncAgent.cpp
+0 −52 pendingqueue/ExternalQueueSyncAgent.h
+0 −42 pendingqueue/ExternalQueueSyncThread.cpp
+0 −36 pendingqueue/ExternalQueueSyncThread.h
+27 −101 pendingqueue/PendingTransactionsAgent.cpp
+0 −10 pendingqueue/PendingTransactionsAgent.h
+16 −35 pendingqueue/TestMessageGeneratorAgent.cpp
+3 −5 pendingqueue/TestMessageGeneratorAgent.h
+0 −45 pendingqueue/TestMessageGeneratorThreadPool.cpp
+0 −36 pendingqueue/TestMessageGeneratorThreadPool.h
19 changes: 19 additions & 0 deletions scripts/calculate_rc_version.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
#!/bin/bash

VERSION=$1

if [ -z $VERSION ]; then
echo "The base version is not set."
exit 1
fi

git fetch --tags

for (( RC_NUMBER=0; ; RC_NUMBER++ ))
do
RC_VERSION="$VERSION-rc.$RC_NUMBER"
if ! [ $(git tag -l ?$RC_VERSION) ]; then
echo $RC_VERSION
break
fi
done
4 changes: 0 additions & 4 deletions scripts/skale_build/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,12 @@ FROM ubuntu:16.04

RUN apt-get -q update && \
apt-get -qy install \

software-properties-common \

curl \
libgmp-dev \
libleveldb-dev \

nettle-bin \
gnutls-bin \

python3 \
python3-pip

Expand Down
18 changes: 0 additions & 18 deletions scripts/skale_build/README.md

This file was deleted.

78 changes: 0 additions & 78 deletions scripts/skale_build/build_image.py

This file was deleted.

8 changes: 8 additions & 0 deletions scripts/skale_build/build_image.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
#!/bin/bash

VERSION=$1
IMAGE_NAME=skalelabshub/schain:$VERSION

echo "Build image $IMAGE_NAME"

docker build -t $IMAGE_NAME .
1 change: 0 additions & 1 deletion scripts/skale_build/config.json

This file was deleted.

9 changes: 9 additions & 0 deletions scripts/skale_build/deploy_image.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#!/bin/bash

VERSION=$1
DOCKER_USERNAME=$2
DOCKER_PASSWORD=$3
IMAGE_NAME=skalelabshub/schain:$VERSION

docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD
docker push $IMAGE_NAME
2 changes: 0 additions & 2 deletions scripts/skale_build/requirements.txt

This file was deleted.

0 comments on commit aab9ac2

Please sign in to comment.