Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature ci test #8

Merged
merged 6 commits into from
Jun 27, 2018
Merged

Feature ci test #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d4af5be
remove conan user file
fpelliccioni Jun 27, 2018
18167ca
change version format
fpelliccioni Jun 27, 2018
dfbd880
conan_user is optional
fpelliccioni Jun 27, 2018
6a939b9
dummy commit
fpelliccioni Jun 27, 2018
d8e705f
dummy commit
fpelliccioni Jun 27, 2018
785cca4
dummy commit
fpelliccioni Jun 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ branches:
only:
# - master
- dev
- feature_ci_test
- /^v\d+\.\d+\.\d+$/
- /^release-\d+\.\d+\.\d+$/
- /^feature-ci-.+$/
Expand Down
1 change: 1 addition & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
#


cmake_minimum_required(VERSION 3.4)

# secp256k1
Expand Down
1 change: 1 addition & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ This library is a work in progress and is being used to research best practices.
|:------:|:-:|:-:|:-:|
| [![Build Status](https://travis-ci.org/bitprim/secp256k1.svg)](https://travis-ci.org/bitprim/secp256k1) | [![Build StatusB](https://travis-ci.org/bitprim/secp256k1.svg?branch=dev)](https://travis-ci.org/bitprim/secp256k1?branch=dev) | [![Appveyor Status](https://ci.appveyor.com/api/projects/status/github/bitprim/secp256k1?svg=true)](https://ci.appveyor.com/project/bitprim/secp256k1) | [![Appveyor StatusB](https://ci.appveyor.com/api/projects/status/github/bitprim/secp256k1?branch=dev&svg=true)](https://ci.appveyor.com/project/bitprim/secp256k1?branch=dev) |


Features:
* secp256k1 ECDSA signing/verification and key generation.
* Adding/multiplying private/public keys.
Expand Down
2 changes: 1 addition & 1 deletion ci_utils
Open in desktop
Submodule ci_utils updated from 1341c8 to 39522e
1 change: 0 additions & 1 deletion conan_user
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion conan_version
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.4
0.4.0
2 changes: 1 addition & 1 deletion conanfile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ class Secp256k1Conan(ConanFile):
generators = "cmake"
build_policy = "missing"

exports = "conan_version", "conan_req_version", "conan_user", "ci_utils/*" #"conan_channel"
exports = "conan_version", "conan_req_version", "ci_utils/*" #"conan_channel", "conan_user"
exports_sources = "src/*", "include/*", "CMakeLists.txt", "cmake/*", "secp256k1Config.cmake.in", "contrib/*", "test/*"
#, "bitprimbuildinfo.cmake"

Expand Down