Skip to content

Commit

Permalink
Merge pull request #90 from hyperledger/circle.yml
Browse files Browse the repository at this point in the history
Circle.yml
  • Loading branch information
takemiyamakoto committed Dec 16, 2016
2 parents 9672903 + 8222609 commit 19ad459
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@ build/*
.idea/*
*xcworkspace*
.vscode/*
.cmake-build-debug/*
*cmake-build-debug*
8 changes: 4 additions & 4 deletions circle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@ machine:
checkout:
post:
- cd $IROHA_HOME
- cd $IROHA_HOME/core/vendor/leveldb; make -j 14
- cd $IROHA_HOME/core/vendor/ed25519; make -j 14
- cd $IROHA_HOME/core/vendor/leveldb; make -j 4
- cd $IROHA_HOME/core/vendor/ed25519; make -j 4
- cd $IROHA_HOME/core/vendor/Cappuccino; git pull
- cd $IROHA_HOME/core/vendor/KeccakCodePackage; make; make generic64/libkeccak.a
- cd $IROHA_HOME/core/infra/crypto/; make
Expand All @@ -33,11 +33,11 @@ dependencies:
- /tmp/protobuf
- /tmp/grpc
pre:
- if [[ ! -e /tmp/protobuf ]]; then git clone -b v3.0.0 https://github.com/google/protobuf.git /tmp/protobuf; cd /tmp/protobuf; (git cherry-pick 1760feb621a913189b90fe8595fffb74bce84598; echo Force continue); cd /tmp/protobuf; ./autogen.sh; ./configure --prefix=/usr; make -j 16; fi;
- if [[ ! -e /tmp/protobuf ]]; then git clone -b v3.0.0 https://github.com/google/protobuf.git /tmp/protobuf; cd /tmp/protobuf; (git cherry-pick 1760feb621a913189b90fe8595fffb74bce84598; echo Force continue); cd /tmp/protobuf; ./autogen.sh; ./configure --prefix=/usr; make -j 4; fi;
- cd /tmp/protobuf; sudo make install
- protoc --version

- if [[ ! -e /tmp/grpc ]]; then git clone -b $(curl -L http://grpc.io/release) https://github.com/grpc/grpc /tmp/grpc; cd /tmp/grpc; git submodule update --init; make -j 14; fi;
- if [[ ! -e /tmp/grpc ]]; then git clone -b $(curl -L http://grpc.io/release) https://github.com/grpc/grpc /tmp/grpc; cd /tmp/grpc; git submodule update --init; make -j 4; fi;
- cd /tmp/grpc; sudo make install
- which grpc_cpp_plugin

Expand Down
2 changes: 1 addition & 1 deletion core/vendor/Cappuccino
Submodule Cappuccino updated 4 files
+1 −2 .travis.yml
+17 −15 README.md
+161 −204 cappuccino.hpp
+13 −6 samples/chino.cpp

0 comments on commit 19ad459

Please sign in to comment.