Feature ci test (#8)

* remove conan user file * change version format * conan_user is optional * dummy commit * dummy commit * dummy commit
bitprim · Jun 27, 2018 · a54e06d · a54e06d
1 parent 769e3e8
commit a54e06d
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -21,6 +21,7 @@ branches:
   only:
   # - master
   - dev
+  - feature_ci_test
   - /^v\d+\.\d+\.\d+$/
   - /^release-\d+\.\d+\.\d+$/
   - /^feature-ci-.+$/

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -17,6 +17,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
+
 cmake_minimum_required(VERSION 3.4)
 
 # secp256k1

diff --git a/README.md b/README.md
@@ -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.

diff --git a/ci_utils b/ci_utils
diff --git a/conan_user b/conan_user
diff --git a/conan_version b/conan_version
@@ -1 +1 @@
-0.4
+0.4.0
diff --git a/conanfile.py b/conanfile.py
@@ -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"
-Original file 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 @@