From 093a87ad09b1adf1184c7b0bee201d647a8da419 Mon Sep 17 00:00:00 2001 From: Cam Parra Date: Sun, 9 Sep 2018 19:30:26 -0600 Subject: [PATCH 01/36] updating deps Signed-off-by: Cam Parra --- devops/aws-codebuild/Jenkinsfile.ci | 4 ++-- devops/docker/ci/xenial/Dockerfile | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/devops/aws-codebuild/Jenkinsfile.ci b/devops/aws-codebuild/Jenkinsfile.ci index d114edd52..c0c53b3bb 100644 --- a/devops/aws-codebuild/Jenkinsfile.ci +++ b/devops/aws-codebuild/Jenkinsfile.ci @@ -51,8 +51,8 @@ pipelineWrapper({ // not accurate (it concatenates them): // debian package version: + // debian package name: - def sovtoken_deb_version = "0.9.21.94" - def sovtokenfees_deb_version = "0.9.21.94" + def sovtoken_deb_version = "0.9.25.98" + def sovtokenfees_deb_version = "0.9.25.98" sh """ cd ./devops/docker/ci/xenial/ diff --git a/devops/docker/ci/xenial/Dockerfile b/devops/docker/ci/xenial/Dockerfile index 847f4567c..3913f31ba 100644 --- a/devops/docker/ci/xenial/Dockerfile +++ b/devops/docker/ci/xenial/Dockerfile @@ -34,11 +34,11 @@ RUN apt-get update && apt-get install -y --no-install-recommends \ # - have explicitly defined versions in packages depends list # - are likely to be updated (e.g. packaged 3rd parties like python3-pyzmq # or python3-rocksdb are not specified here) -ENV LIBINDY_CRYPTO_VERSION ${LIBINDY_CRYPTO_VERSION:-0.4.1} -ENV PYTHON3_INDY_CRYPTO_VERSION ${PYTHON3_INDY_CRYPTO_VERSION:-0.4.1} -ENV INDY_PLENUM_VERSION ${INDY_PLENUM_VERSION:-1.6.50} +ENV LIBINDY_CRYPTO_VERSION ${LIBINDY_CRYPTO_VERSION:-0.4.3} +ENV PYTHON3_INDY_CRYPTO_VERSION ${PYTHON3_INDY_CRYPTO_VERSION:-0.4.3} +ENV INDY_PLENUM_VERSION ${INDY_PLENUM_VERSION:-1.6.51} ENV INDY_ANONCREDS_VERSION ${INDY_ANONCREDS_VERSION:-1.0.11} -ENV INDY_NODE_VERSION ${INDY_NODE_VERSION:-1.6.71} +ENV INDY_NODE_VERSION ${INDY_NODE_VERSION:-1.6.73} RUN echo "deb https://repo.sovrin.org/sdk/deb xenial stable" >> /etc/apt/sources.list RUN echo "deb https://repo.sovrin.org/deb xenial stable" >> /etc/apt/sources.list \ && apt-get update && apt-get install -y --no-install-recommends \ @@ -90,4 +90,4 @@ COPY libsovtoken-ci-entrypoint.sh /usr/local/bin/ RUN chmod +x /usr/local/bin/libsovtoken-ci-entrypoint.sh ENTRYPOINT ["libsovtoken-ci-entrypoint.sh"] -ENV LIBSOVTOKEN_CI_ENV_VERSION=0.40.0 +ENV LIBSOVTOKEN_CI_ENV_VERSION=0.41.0 From e8796109758ea2670f55cc74fc002a1e7d9d8d9a Mon Sep 17 00:00:00 2001 From: Nikita Khateev Date: Mon, 10 Sep 2018 13:21:26 +0300 Subject: [PATCH 02/36] Updated genesis txns Signed-off-by: Nikita Khateev --- libsovtoken/tests/utils/pool.rs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libsovtoken/tests/utils/pool.rs b/libsovtoken/tests/utils/pool.rs index d3dd9d081..0ca01f79a 100644 --- a/libsovtoken/tests/utils/pool.rs +++ b/libsovtoken/tests/utils/pool.rs @@ -27,10 +27,10 @@ fn create_genesis_txn_file_for_test_pool(pool_name: &str, let test_pool_ip = EnvironmentUtils::test_pool_ip(); let node_txns = vec![ - format!(r#"{{"reqSignature":{{}},"txn":{{"data":{{"data":{{"alias":"Node1","blskey":"4N8aUNHSgjQVgkpm8nhNEfDf6txHznoYREg9kirmJrkivgL4oSEimFF6nsQ6M41QvhM2Z33nves5vfSn9n1UwNFJBYtWVnHYMATn76vLuL3zU88KyeAYcHfsih3He6UHcXDxcaecHVz6jhCYz1P2UZn2bDVruL5wXpehgBfBaLKm3Ba","client_ip":"{}","client_port":9702,"node_ip":"{}","node_port":9701,"services":["VALIDATOR"]}},"dest":"Gw6pDLhcBcoQesN72qfotTgFa7cbuqZpkX3Xo6pLhPhv"}},"metadata":{{"from":"Th7MpTaRZVRYnPiabds81Y"}},"type":"0"}},"txnMetadata":{{"seqNo":1,"txnId":"fea82e10e894419fe2bea7d96296a6d46f50f93f9eeda954ec461b2ed2950b62"}},"ver":"1"}}"#, test_pool_ip, test_pool_ip), - format!(r#"{{"reqSignature":{{}},"txn":{{"data":{{"data":{{"alias":"Node2","blskey":"37rAPpXVoxzKhz7d9gkUe52XuXryuLXoM6P6LbWDB7LSbG62Lsb33sfG7zqS8TK1MXwuCHj1FKNzVpsnafmqLG1vXN88rt38mNFs9TENzm4QHdBzsvCuoBnPH7rpYYDo9DZNJePaDvRvqJKByCabubJz3XXKbEeshzpz4Ma5QYpJqjk","client_ip":"{}","client_port":9704,"node_ip":"{}","node_port":9703,"services":["VALIDATOR"]}},"dest":"8ECVSk179mjsjKRLWiQtssMLgp6EPhWXtaYyStWPSGAb"}},"metadata":{{"from":"EbP4aYNeTHL6q385GuVpRV"}},"type":"0"}},"txnMetadata":{{"seqNo":2,"txnId":"1ac8aece2a18ced660fef8694b61aac3af08ba875ce3026a160acbc3a3af35fc"}},"ver":"1"}}"#, test_pool_ip, test_pool_ip), - format!(r#"{{"reqSignature":{{}},"txn":{{"data":{{"data":{{"alias":"Node3","blskey":"3WFpdbg7C5cnLYZwFZevJqhubkFALBfCBBok15GdrKMUhUjGsk3jV6QKj6MZgEubF7oqCafxNdkm7eswgA4sdKTRc82tLGzZBd6vNqU8dupzup6uYUf32KTHTPQbuUM8Yk4QFXjEf2Usu2TJcNkdgpyeUSX42u5LqdDDpNSWUK5deC5","client_ip":"{}","client_port":9706,"node_ip":"{}","node_port":9705,"services":["VALIDATOR"]}},"dest":"DKVxG2fXXTU8yT5N7hGEbXB3dfdAnYv1JczDUHpmDxya"}},"metadata":{{"from":"4cU41vWW82ArfxJxHkzXPG"}},"type":"0"}},"txnMetadata":{{"seqNo":3,"txnId":"7e9f355dffa78ed24668f0e0e369fd8c224076571c51e2ea8be5f26479edebe4"}},"ver":"1"}}"#, test_pool_ip, test_pool_ip), - format!(r#"{{"reqSignature":{{}},"txn":{{"data":{{"data":{{"alias":"Node4","blskey":"2zN3bHM1m4rLz54MJHYSwvqzPchYp8jkHswveCLAEJVcX6Mm1wHQD1SkPYMzUDTZvWvhuE6VNAkK3KxVeEmsanSmvjVkReDeBEMxeDaayjcZjFGPydyey1qxBHmTvAnBKoPydvuTAqx5f7YNNRAdeLmUi99gERUU7TD8KfAa6MpQ9bw","client_ip":"{}","client_port":9708,"node_ip":"{}","node_port":9707,"services":["VALIDATOR"]}},"dest":"4PS3EDQ3dW1tci1Bp6543CfuuebjFrg36kLAUcskGfaA"}},"metadata":{{"from":"TWwCRQRZ2ZHMJFn9TzLp7W"}},"type":"0"}},"txnMetadata":{{"seqNo":4,"txnId":"aa5e817d7cc626170eca175822029339a444eb0ee8f0bd20d3b0b76e566fb008"}},"ver":"1"}}"#, test_pool_ip, test_pool_ip)]; + format!(r#"{{"reqSignature":{{}},"txn":{{"data":{{"data":{{"alias":"Node1","blskey":"4N8aUNHSgjQVgkpm8nhNEfDf6txHznoYREg9kirmJrkivgL4oSEimFF6nsQ6M41QvhM2Z33nves5vfSn9n1UwNFJBYtWVnHYMATn76vLuL3zU88KyeAYcHfsih3He6UHcXDxcaecHVz6jhCYz1P2UZn2bDVruL5wXpehgBfBaLKm3Ba","blskey_pop":"RahHYiCvoNCtPTrVtP7nMC5eTYrsUA8WjXbdhNc8debh1agE9bGiJxWBXYNFbnJXoXhWFMvyqhqhRoq737YQemH5ik9oL7R4NTTCz2LEZhkgLJzB3QRQqJyBNyv7acbdHrAT8nQ9UkLbaVL9NBpnWXBTw4LEMePaSHEw66RzPNdAX1","client_ip":"{}","client_port":9702,"node_ip":"{}","node_port":9701,"services":["VALIDATOR"]}},"dest":"Gw6pDLhcBcoQesN72qfotTgFa7cbuqZpkX3Xo6pLhPhv"}},"metadata":{{"from":"Th7MpTaRZVRYnPiabds81Y"}},"type":"0"}},"txnMetadata":{{"seqNo":1,"txnId":"fea82e10e894419fe2bea7d96296a6d46f50f93f9eeda954ec461b2ed2950b62"}},"ver":"1"}}"#, test_pool_ip, test_pool_ip), + format!(r#"{{"reqSignature":{{}},"txn":{{"data":{{"data":{{"alias":"Node2","blskey":"37rAPpXVoxzKhz7d9gkUe52XuXryuLXoM6P6LbWDB7LSbG62Lsb33sfG7zqS8TK1MXwuCHj1FKNzVpsnafmqLG1vXN88rt38mNFs9TENzm4QHdBzsvCuoBnPH7rpYYDo9DZNJePaDvRvqJKByCabubJz3XXKbEeshzpz4Ma5QYpJqjk","blskey_pop":"Qr658mWZ2YC8JXGXwMDQTzuZCWF7NK9EwxphGmcBvCh6ybUuLxbG65nsX4JvD4SPNtkJ2w9ug1yLTj6fgmuDg41TgECXjLCij3RMsV8CwewBVgVN67wsA45DFWvqvLtu4rjNnE9JbdFTc1Z4WCPA3Xan44K1HoHAq9EVeaRYs8zoF5","client_ip":"{}","client_port":9704,"node_ip":"{}","node_port":9703,"services":["VALIDATOR"]}},"dest":"8ECVSk179mjsjKRLWiQtssMLgp6EPhWXtaYyStWPSGAb"}},"metadata":{{"from":"EbP4aYNeTHL6q385GuVpRV"}},"type":"0"}},"txnMetadata":{{"seqNo":2,"txnId":"1ac8aece2a18ced660fef8694b61aac3af08ba875ce3026a160acbc3a3af35fc"}},"ver":"1"}}"#, test_pool_ip, test_pool_ip), + format!(r#"{{"reqSignature":{{}},"txn":{{"data":{{"data":{{"alias":"Node3","blskey":"3WFpdbg7C5cnLYZwFZevJqhubkFALBfCBBok15GdrKMUhUjGsk3jV6QKj6MZgEubF7oqCafxNdkm7eswgA4sdKTRc82tLGzZBd6vNqU8dupzup6uYUf32KTHTPQbuUM8Yk4QFXjEf2Usu2TJcNkdgpyeUSX42u5LqdDDpNSWUK5deC5","blskey_pop":"QwDeb2CkNSx6r8QC8vGQK3GRv7Yndn84TGNijX8YXHPiagXajyfTjoR87rXUu4G4QLk2cF8NNyqWiYMus1623dELWwx57rLCFqGh7N4ZRbGDRP4fnVcaKg1BcUxQ866Ven4gw8y4N56S5HzxXNBZtLYmhGHvDtk6PFkFwCvxYrNYjh","client_ip":"{}","client_port":9706,"node_ip":"{}","node_port":9705,"services":["VALIDATOR"]}},"dest":"DKVxG2fXXTU8yT5N7hGEbXB3dfdAnYv1JczDUHpmDxya"}},"metadata":{{"from":"4cU41vWW82ArfxJxHkzXPG"}},"type":"0"}},"txnMetadata":{{"seqNo":3,"txnId":"7e9f355dffa78ed24668f0e0e369fd8c224076571c51e2ea8be5f26479edebe4"}},"ver":"1"}}"#, test_pool_ip, test_pool_ip), + format!(r#"{{"reqSignature":{{}},"txn":{{"data":{{"data":{{"alias":"Node4","blskey":"2zN3bHM1m4rLz54MJHYSwvqzPchYp8jkHswveCLAEJVcX6Mm1wHQD1SkPYMzUDTZvWvhuE6VNAkK3KxVeEmsanSmvjVkReDeBEMxeDaayjcZjFGPydyey1qxBHmTvAnBKoPydvuTAqx5f7YNNRAdeLmUi99gERUU7TD8KfAa6MpQ9bw","blskey_pop":"RPLagxaR5xdimFzwmzYnz4ZhWtYQEj8iR5ZU53T2gitPCyCHQneUn2Huc4oeLd2B2HzkGnjAff4hWTJT6C7qHYB1Mv2wU5iHHGFWkhnTX9WsEAbunJCV2qcaXScKj4tTfvdDKfLiVuU2av6hbsMztirRze7LvYBkRHV3tGwyCptsrP","client_ip":"{}","client_port":9708,"node_ip":"{}","node_port":9707,"services":["VALIDATOR"]}},"dest":"4PS3EDQ3dW1tci1Bp6543CfuuebjFrg36kLAUcskGfaA"}},"metadata":{{"from":"TWwCRQRZ2ZHMJFn9TzLp7W"}},"type":"0"}},"txnMetadata":{{"seqNo":4,"txnId":"aa5e817d7cc626170eca175822029339a444eb0ee8f0bd20d3b0b76e566fb008"}},"ver":"1"}}"#, test_pool_ip, test_pool_ip)]; let txn_file_data = node_txns[0..(nodes_count as usize)].join("\n"); From 5871d6a4cb93a8e5f677040e6d594e4025500c0b Mon Sep 17 00:00:00 2001 From: Andrey Kononykhin Date: Wed, 12 Sep 2018 16:14:36 +0300 Subject: [PATCH 03/36] set version of jenkins shared lib to v0.2.0-aws-codebuild Signed-off-by: Andrey Kononykhin --- devops/aws-codebuild/Jenkinsfile.cd | 2 +- devops/aws-codebuild/Jenkinsfile.ci | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/devops/aws-codebuild/Jenkinsfile.cd b/devops/aws-codebuild/Jenkinsfile.cd index 1b22b3de5..0cb288701 100644 --- a/devops/aws-codebuild/Jenkinsfile.cd +++ b/devops/aws-codebuild/Jenkinsfile.cd @@ -1,6 +1,6 @@ #!groovy -def evLibrary = library(identifier: 'evernym-aws-codebuild@aws-codebuild', retriever: modernSCM( +def evLibrary = library(identifier: 'evernym-aws-codebuild@v0.2.0-aws-codebuild', retriever: modernSCM( github(credentialsId: 'evernym-github-machine-user', repoOwner: 'evernym', repository: 'jenkins-shared') )).com.evernym.pipeline diff --git a/devops/aws-codebuild/Jenkinsfile.ci b/devops/aws-codebuild/Jenkinsfile.ci index c0c53b3bb..48852ed2e 100644 --- a/devops/aws-codebuild/Jenkinsfile.ci +++ b/devops/aws-codebuild/Jenkinsfile.ci @@ -1,6 +1,6 @@ #!groovy -def evLibrary = library(identifier: 'evernym-aws-codebuild@aws-codebuild', retriever: modernSCM( +def evLibrary = library(identifier: 'evernym-aws-codebuild@v0.2.0-aws-codebuild', retriever: modernSCM( github(credentialsId: 'evernym-github-machine-user', repoOwner: 'evernym', repository: 'jenkins-shared') )).com.evernym.pipeline From f384ad6c1ad0de0859727e75f0d64a1cb87ba9ac Mon Sep 17 00:00:00 2001 From: Cam Parra Date: Wed, 12 Sep 2018 14:06:10 -0600 Subject: [PATCH 04/36] the builds no longer depend on a self built libindy but now pull from repo.sovrin.org Signed-off-by: Cam Parra --- .gitignore | 2 +- .../ios/mac/mac.01.libindy.setup.sh | 10 ++-- .../ios/mac/mac.14.libsovtoken.build.sh | 54 +++++++++++++------ .../build_scripts/ios/mac/shared.functions.sh | 4 ++ 4 files changed, 47 insertions(+), 23 deletions(-) diff --git a/.gitignore b/.gitignore index e2db53478..da643fd13 100644 --- a/.gitignore +++ b/.gitignore @@ -23,7 +23,7 @@ libsovtoken/build_scripts/android/libsovtoken/linux-arm64/ libsovtoken/build_scripts/android/libsovtoken/linux-x86/ libsovtoken/build_scripts/android/libsovtoken/linux-x86_64/ devops/_build - +libsovtoken/.macosbuild/ # Mac directory attributes *.DS_Store *.deb diff --git a/libsovtoken/build_scripts/ios/mac/mac.01.libindy.setup.sh b/libsovtoken/build_scripts/ios/mac/mac.01.libindy.setup.sh index 8ec667060..74da11fae 100755 --- a/libsovtoken/build_scripts/ios/mac/mac.01.libindy.setup.sh +++ b/libsovtoken/build_scripts/ios/mac/mac.01.libindy.setup.sh @@ -44,7 +44,7 @@ fi if [[ $RUSTUP_VERSION =~ ^'rustup ' ]]; then rustup component add rls-preview rust-analysis rust-src - + rustup target remove aarch64-linux-android armv7-linux-androideabi arm-linux-androideabi i686-linux-android x86_64-linux-android rustup target add aarch64-apple-ios armv7-apple-ios armv7s-apple-ios x86_64-apple-ios i386-apple-ios @@ -58,18 +58,18 @@ if [[ $RUSTUP_VERSION =~ ^'rustup ' ]]; then cargo install cargo-lipo cargo install cargo-xcode - + BREW_VERSION=`brew --version` if ! [[ $BREW_VERSION =~ ^'Homebrew ' ]]; then /usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)" brew doctor brew update fi - + #2) Install required native libraries and utilities (libsodium is added with URL to homebrew since version<1.0.15 is required) brew install pkg-config - brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/65effd2b617bade68a8a2c5b39e1c3089cc0e945/Formula/libsodium.rb - brew install automake + brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/65effd2b617bade68a8a2c5b39e1c3089cc0e945/Formula/libsodium.rb + brew install automake brew install autoconf brew install cmake brew install openssl diff --git a/libsovtoken/build_scripts/ios/mac/mac.14.libsovtoken.build.sh b/libsovtoken/build_scripts/ios/mac/mac.14.libsovtoken.build.sh index 3c5b29f30..db3c0c8fa 100755 --- a/libsovtoken/build_scripts/ios/mac/mac.14.libsovtoken.build.sh +++ b/libsovtoken/build_scripts/ios/mac/mac.14.libsovtoken.build.sh @@ -1,5 +1,18 @@ #!/bin/sh +set -xv + +function extract_target() { + case $1 in + aarch64-apple-ios) echo "arm64" ;; + armv7-apple-ios) echo "armv7" ;; + armv7s-apple-ios) echo "armv7s" ;; + i386-apple-ios) echo "i386" ;; + x86_64-apple-ios) echo "x86_64" ;; + \?) exit 1 + esac +} + source ./shared.functions.sh START_DIR=${PWD} @@ -7,6 +20,16 @@ WORK_DIR=$(get_work_dir) mkdir -p ${WORK_DIR} source ./mac.02.libindy.env.sh + + +mkdir -p ${WORK_DIR}/sovtoken-indy-sdk +if [ ! -f "${WORK_DIR}/sovtoken-indy-sdk/libindy.a" ] ; then + command pushd ${WORK_DIR}/sovtoken-indy-sdk > /dev/null + curl -sSLO ${LIBINDY_IOS_BUILD_URL} + tar -xf ${LIBINDY_FILE} + command popd > /dev/null + fi + if [ ! -d "${WORK_DIR}/sovtoken-indy-sdk" ]; then echo STDERR "Unable to find ${WORK_DIR}/sovtoken-indy-sdk directory" exit 1 @@ -20,6 +43,7 @@ fi ######################################################################################################################### # Now build libsovtoken ######################################################################################################################### +echo $(get_sovtoken_dir) cd $(get_sovtoken_dir) if [ "$DEBUG_SYMBOLS" = "debuginfo" ]; then @@ -31,33 +55,29 @@ IFS=',()][' read -r -a targets <<<"${IOS_TARGETS}" echo "Building targets: ${targets[@]}" IFS="$bkpIFS" + to_combine="" for target in ${targets[*]} do - export LIBINDY_DIR=${WORK_DIR}/sovtoken-indy-sdk/libindy/target/${target}/release + LIBINDY=${WORK_DIR}/sovtoken-indy-sdk + + export LIBINDY_DIR=${LIBINDY}/${target} + mkdir -p ${LIBINDY_DIR} + etarget=$(extract_target $target) + + echo "LIBINDY_DIR=${LIBINDY_DIR}" + lipo -extract_family $etarget $LIBINDY/libindy.a -o $LIBINDY_DIR/libindy.a cargo lipo --release --verbose --targets="${target}" + mv ./target/$target/release/libsovtoken.a ./target/$target/libsovtoken-unstripped.a + strip -S -x -o ./target/$target/libsovtoken.a -r ./target/$target/libsovtoken-unstripped.a to_combine="${to_combine} ./target/${target}/release/libsovtoken.a" - done mkdir -p ./target/universal/release lipo -create $to_combine -o ./target/universal/release/libsovtoken.a +cp ./target/universal/release/libsovtoken.a ./target/universal/libsovtoken-unstripped.a +strip -S -x -o ./target/universal/libsovtoken.a -r ./target/universal/libsovtoken-unstripped.a -for arch in ${IOS_TARGETS[@]}; do - if [ -f ./target.$arch/release/libsovtoken.a ] ; then - mv ./target/$arch/release/libsovtoken.a ./target/$arch/libsovtoken-unstripped.a - # to ensure the library is as small as possible....even though we are using cargo build /release - # we still have extraneous data in the library that needs to be removed - strip -S -x -o ./target/$arch/libsovtoken.a -r ./target/$arch/libsovtoken-unstripped.a - fi -done - -if [ -f ./target/universal/release/libsovtoken.a ] ; then - cp ./target/universal/release/libsovtoken.a ./target/universal/libsovtoken-unstripped.a - # to ensure the library is as small as possible....even though we are using cargo build /release - # we still have extraneous data in the library that needs to be removed - strip -S -x -o ./target/universal/libsovtoken.a -r ./target/universal/libsovtoken-unstripped.a -fi BUILD_TIME=$(date -u "+%Y%m%d%H%M") GIT_REV=$(git rev-parse --short HEAD) diff --git a/libsovtoken/build_scripts/ios/mac/shared.functions.sh b/libsovtoken/build_scripts/ios/mac/shared.functions.sh index f3ee0b378..51e416687 100644 --- a/libsovtoken/build_scripts/ios/mac/shared.functions.sh +++ b/libsovtoken/build_scripts/ios/mac/shared.functions.sh @@ -1,4 +1,8 @@ #!/bin/sh +export LIBINDY_IOS_BUILD_URL="https://repo.sovrin.org/ios/libindy/stable/libindy-core/1.6.5/libindy.tar.gz" +export LIBINDY_FILE=$(basename ${LIBINDY_IOS_BUILD_URL}) +export LIBINDY_VERSION=$(basename $(dirname ${LIBINDY_IOS_BUILD_URL})) +export BUILD_CACHE=~/.build_libvxc/ioscache function abspath() { perl -e 'use Cwd "abs_path"; print abs_path(shift)' $1 From bfac7fa69db69a75e860c97c6e89b08bcfa51317 Mon Sep 17 00:00:00 2001 From: Cam Parra Date: Wed, 12 Sep 2018 14:19:28 -0600 Subject: [PATCH 05/36] Revert "the builds no longer depend on a self built libindy but now pull from repo.sovrin.org" This reverts commit f384ad6c1ad0de0859727e75f0d64a1cb87ba9ac. --- .gitignore | 2 +- .../ios/mac/mac.01.libindy.setup.sh | 10 ++-- .../ios/mac/mac.14.libsovtoken.build.sh | 54 ++++++------------- .../build_scripts/ios/mac/shared.functions.sh | 4 -- 4 files changed, 23 insertions(+), 47 deletions(-) diff --git a/.gitignore b/.gitignore index da643fd13..e2db53478 100644 --- a/.gitignore +++ b/.gitignore @@ -23,7 +23,7 @@ libsovtoken/build_scripts/android/libsovtoken/linux-arm64/ libsovtoken/build_scripts/android/libsovtoken/linux-x86/ libsovtoken/build_scripts/android/libsovtoken/linux-x86_64/ devops/_build -libsovtoken/.macosbuild/ + # Mac directory attributes *.DS_Store *.deb diff --git a/libsovtoken/build_scripts/ios/mac/mac.01.libindy.setup.sh b/libsovtoken/build_scripts/ios/mac/mac.01.libindy.setup.sh index 74da11fae..8ec667060 100755 --- a/libsovtoken/build_scripts/ios/mac/mac.01.libindy.setup.sh +++ b/libsovtoken/build_scripts/ios/mac/mac.01.libindy.setup.sh @@ -44,7 +44,7 @@ fi if [[ $RUSTUP_VERSION =~ ^'rustup ' ]]; then rustup component add rls-preview rust-analysis rust-src - + rustup target remove aarch64-linux-android armv7-linux-androideabi arm-linux-androideabi i686-linux-android x86_64-linux-android rustup target add aarch64-apple-ios armv7-apple-ios armv7s-apple-ios x86_64-apple-ios i386-apple-ios @@ -58,18 +58,18 @@ if [[ $RUSTUP_VERSION =~ ^'rustup ' ]]; then cargo install cargo-lipo cargo install cargo-xcode - + BREW_VERSION=`brew --version` if ! [[ $BREW_VERSION =~ ^'Homebrew ' ]]; then /usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)" brew doctor brew update fi - + #2) Install required native libraries and utilities (libsodium is added with URL to homebrew since version<1.0.15 is required) brew install pkg-config - brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/65effd2b617bade68a8a2c5b39e1c3089cc0e945/Formula/libsodium.rb - brew install automake + brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/65effd2b617bade68a8a2c5b39e1c3089cc0e945/Formula/libsodium.rb + brew install automake brew install autoconf brew install cmake brew install openssl diff --git a/libsovtoken/build_scripts/ios/mac/mac.14.libsovtoken.build.sh b/libsovtoken/build_scripts/ios/mac/mac.14.libsovtoken.build.sh index db3c0c8fa..3c5b29f30 100755 --- a/libsovtoken/build_scripts/ios/mac/mac.14.libsovtoken.build.sh +++ b/libsovtoken/build_scripts/ios/mac/mac.14.libsovtoken.build.sh @@ -1,18 +1,5 @@ #!/bin/sh -set -xv - -function extract_target() { - case $1 in - aarch64-apple-ios) echo "arm64" ;; - armv7-apple-ios) echo "armv7" ;; - armv7s-apple-ios) echo "armv7s" ;; - i386-apple-ios) echo "i386" ;; - x86_64-apple-ios) echo "x86_64" ;; - \?) exit 1 - esac -} - source ./shared.functions.sh START_DIR=${PWD} @@ -20,16 +7,6 @@ WORK_DIR=$(get_work_dir) mkdir -p ${WORK_DIR} source ./mac.02.libindy.env.sh - - -mkdir -p ${WORK_DIR}/sovtoken-indy-sdk -if [ ! -f "${WORK_DIR}/sovtoken-indy-sdk/libindy.a" ] ; then - command pushd ${WORK_DIR}/sovtoken-indy-sdk > /dev/null - curl -sSLO ${LIBINDY_IOS_BUILD_URL} - tar -xf ${LIBINDY_FILE} - command popd > /dev/null - fi - if [ ! -d "${WORK_DIR}/sovtoken-indy-sdk" ]; then echo STDERR "Unable to find ${WORK_DIR}/sovtoken-indy-sdk directory" exit 1 @@ -43,7 +20,6 @@ fi ######################################################################################################################### # Now build libsovtoken ######################################################################################################################### -echo $(get_sovtoken_dir) cd $(get_sovtoken_dir) if [ "$DEBUG_SYMBOLS" = "debuginfo" ]; then @@ -55,29 +31,33 @@ IFS=',()][' read -r -a targets <<<"${IOS_TARGETS}" echo "Building targets: ${targets[@]}" IFS="$bkpIFS" - to_combine="" for target in ${targets[*]} do - LIBINDY=${WORK_DIR}/sovtoken-indy-sdk - - export LIBINDY_DIR=${LIBINDY}/${target} - mkdir -p ${LIBINDY_DIR} - etarget=$(extract_target $target) - - echo "LIBINDY_DIR=${LIBINDY_DIR}" - lipo -extract_family $etarget $LIBINDY/libindy.a -o $LIBINDY_DIR/libindy.a + export LIBINDY_DIR=${WORK_DIR}/sovtoken-indy-sdk/libindy/target/${target}/release cargo lipo --release --verbose --targets="${target}" - mv ./target/$target/release/libsovtoken.a ./target/$target/libsovtoken-unstripped.a - strip -S -x -o ./target/$target/libsovtoken.a -r ./target/$target/libsovtoken-unstripped.a to_combine="${to_combine} ./target/${target}/release/libsovtoken.a" + done mkdir -p ./target/universal/release lipo -create $to_combine -o ./target/universal/release/libsovtoken.a -cp ./target/universal/release/libsovtoken.a ./target/universal/libsovtoken-unstripped.a -strip -S -x -o ./target/universal/libsovtoken.a -r ./target/universal/libsovtoken-unstripped.a +for arch in ${IOS_TARGETS[@]}; do + if [ -f ./target.$arch/release/libsovtoken.a ] ; then + mv ./target/$arch/release/libsovtoken.a ./target/$arch/libsovtoken-unstripped.a + # to ensure the library is as small as possible....even though we are using cargo build /release + # we still have extraneous data in the library that needs to be removed + strip -S -x -o ./target/$arch/libsovtoken.a -r ./target/$arch/libsovtoken-unstripped.a + fi +done + +if [ -f ./target/universal/release/libsovtoken.a ] ; then + cp ./target/universal/release/libsovtoken.a ./target/universal/libsovtoken-unstripped.a + # to ensure the library is as small as possible....even though we are using cargo build /release + # we still have extraneous data in the library that needs to be removed + strip -S -x -o ./target/universal/libsovtoken.a -r ./target/universal/libsovtoken-unstripped.a +fi BUILD_TIME=$(date -u "+%Y%m%d%H%M") GIT_REV=$(git rev-parse --short HEAD) diff --git a/libsovtoken/build_scripts/ios/mac/shared.functions.sh b/libsovtoken/build_scripts/ios/mac/shared.functions.sh index 51e416687..f3ee0b378 100644 --- a/libsovtoken/build_scripts/ios/mac/shared.functions.sh +++ b/libsovtoken/build_scripts/ios/mac/shared.functions.sh @@ -1,8 +1,4 @@ #!/bin/sh -export LIBINDY_IOS_BUILD_URL="https://repo.sovrin.org/ios/libindy/stable/libindy-core/1.6.5/libindy.tar.gz" -export LIBINDY_FILE=$(basename ${LIBINDY_IOS_BUILD_URL}) -export LIBINDY_VERSION=$(basename $(dirname ${LIBINDY_IOS_BUILD_URL})) -export BUILD_CACHE=~/.build_libvxc/ioscache function abspath() { perl -e 'use Cwd "abs_path"; print abs_path(shift)' $1 From 8c4d203a0ab5200e508970acaae61734cbd28a8c Mon Sep 17 00:00:00 2001 From: Cam Parra Date: Wed, 12 Sep 2018 15:02:51 -0600 Subject: [PATCH 06/36] this will not allow for build files to be added Signed-off-by: Cam Parra --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index e2db53478..daa6ded9d 100644 --- a/.gitignore +++ b/.gitignore @@ -23,6 +23,7 @@ libsovtoken/build_scripts/android/libsovtoken/linux-arm64/ libsovtoken/build_scripts/android/libsovtoken/linux-x86/ libsovtoken/build_scripts/android/libsovtoken/linux-x86_64/ devops/_build +libsovtoken/.macosbuild/ # Mac directory attributes *.DS_Store From 7e72a349fcc68a50d931ea0d801fb68320a58ed8 Mon Sep 17 00:00:00 2001 From: Cam Parra Date: Wed, 12 Sep 2018 15:04:29 -0600 Subject: [PATCH 07/36] ios builds now use official release of libindy instead of self made Signed-off-by: Cam Parra --- .../ios/mac/mac.14.libsovtoken.build.sh | 51 ++++++++++++------- .../build_scripts/ios/mac/shared.functions.sh | 5 ++ 2 files changed, 39 insertions(+), 17 deletions(-) diff --git a/libsovtoken/build_scripts/ios/mac/mac.14.libsovtoken.build.sh b/libsovtoken/build_scripts/ios/mac/mac.14.libsovtoken.build.sh index 3c5b29f30..67c4cc902 100755 --- a/libsovtoken/build_scripts/ios/mac/mac.14.libsovtoken.build.sh +++ b/libsovtoken/build_scripts/ios/mac/mac.14.libsovtoken.build.sh @@ -1,5 +1,17 @@ #!/bin/sh +set -xv +function extract_target() { + case $1 in + aarch64-apple-ios) echo "arm64" ;; + armv7-apple-ios) echo "armv7" ;; + armv7s-apple-ios) echo "armv7s" ;; + i386-apple-ios) echo "i386" ;; + x86_64-apple-ios) echo "x86_64" ;; + \?) exit 1 + esac +} + source ./shared.functions.sh START_DIR=${PWD} @@ -7,6 +19,16 @@ WORK_DIR=$(get_work_dir) mkdir -p ${WORK_DIR} source ./mac.02.libindy.env.sh + +mkdir -p ${WORK_DIR}/sovtoken-indy-sdk + +if [ ! -f "${WORK_DIR}/sovtoken-indy-sdk/libindy.a" ] ; then + command pushd ${WORK_DIR}/sovtoken-indy-sdk > /dev/null + curl -sSLO ${LIBINDY_IOS_BUILD_URL} + tar -xf ${LIBINDY_FILE} + command popd > /dev/null + fi + if [ ! -d "${WORK_DIR}/sovtoken-indy-sdk" ]; then echo STDERR "Unable to find ${WORK_DIR}/sovtoken-indy-sdk directory" exit 1 @@ -34,30 +56,25 @@ IFS="$bkpIFS" to_combine="" for target in ${targets[*]} do - export LIBINDY_DIR=${WORK_DIR}/sovtoken-indy-sdk/libindy/target/${target}/release + LIBINDY=${WORK_DIR}/sovtoken-indy-sdk + export LIBINDY_DIR=${LIBINDY}/${target} + mkdir -p ${LIBINDY_DIR} + etarget=$(extract_target $target) + + echo "LIBINDY_DIR=${LIBINDY_DIR}" + lipo -extract_family $etarget $LIBINDY/libindy.a -o $LIBINDY_DIR/libindy.a cargo lipo --release --verbose --targets="${target}" + mv ./target/$target/release/libsovtoken.a ./target/$target/libsovtoken-unstripped.a + strip -S -x -o ./target/$target/libsovtoken.a -r ./target/$target/libsovtoken-unstripped.a to_combine="${to_combine} ./target/${target}/release/libsovtoken.a" done + mkdir -p ./target/universal/release lipo -create $to_combine -o ./target/universal/release/libsovtoken.a - -for arch in ${IOS_TARGETS[@]}; do - if [ -f ./target.$arch/release/libsovtoken.a ] ; then - mv ./target/$arch/release/libsovtoken.a ./target/$arch/libsovtoken-unstripped.a - # to ensure the library is as small as possible....even though we are using cargo build /release - # we still have extraneous data in the library that needs to be removed - strip -S -x -o ./target/$arch/libsovtoken.a -r ./target/$arch/libsovtoken-unstripped.a - fi -done - -if [ -f ./target/universal/release/libsovtoken.a ] ; then - cp ./target/universal/release/libsovtoken.a ./target/universal/libsovtoken-unstripped.a - # to ensure the library is as small as possible....even though we are using cargo build /release - # we still have extraneous data in the library that needs to be removed - strip -S -x -o ./target/universal/libsovtoken.a -r ./target/universal/libsovtoken-unstripped.a -fi +cp ./target/universal/release/libsovtoken.a ./target/universal/libsovtoken-unstripped.a +strip -S -x -o ./target/universal/libsovtoken.a -r ./target/universal/libsovtoken-unstripped.a BUILD_TIME=$(date -u "+%Y%m%d%H%M") GIT_REV=$(git rev-parse --short HEAD) diff --git a/libsovtoken/build_scripts/ios/mac/shared.functions.sh b/libsovtoken/build_scripts/ios/mac/shared.functions.sh index f3ee0b378..2d4634725 100644 --- a/libsovtoken/build_scripts/ios/mac/shared.functions.sh +++ b/libsovtoken/build_scripts/ios/mac/shared.functions.sh @@ -1,5 +1,10 @@ #!/bin/sh +export LIBINDY_IOS_BUILD_URL="https://repo.sovrin.org/ios/libindy/stable/libindy-core/1.6.5/libindy.tar.gz" +export LIBINDY_FILE=$(basename ${LIBINDY_IOS_BUILD_URL}) +export LIBINDY_VERSION=$(basename $(dirname ${LIBINDY_IOS_BUILD_URL})) +export BUILD_CACHE=~/.build_libvxc/ioscache + function abspath() { perl -e 'use Cwd "abs_path"; print abs_path(shift)' $1 } From 20f1ac0d5bf378466bed67488442a26a764497b0 Mon Sep 17 00:00:00 2001 From: Cam Parra Date: Wed, 12 Sep 2018 15:12:31 -0600 Subject: [PATCH 08/36] cd now runs correct scripts to build ios Signed-off-by: Cam Parra --- devops/aws-codebuild/Jenkinsfile.cd | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/devops/aws-codebuild/Jenkinsfile.cd b/devops/aws-codebuild/Jenkinsfile.cd index 1b22b3de5..f9f2bfe3b 100644 --- a/devops/aws-codebuild/Jenkinsfile.cd +++ b/devops/aws-codebuild/Jenkinsfile.cd @@ -295,30 +295,6 @@ def macOSPipeline = { sh './mac.01.libindy.setup.sh' } - stage('mac.02.libindy.env.sh') { - sh ". mac.02.libindy.env.sh" - } - - stage('mac.03.libindy.build.sh') { - try { - sh "./mac.03.libindy.build.sh" - } catch ( exc ) { - logger.info("Stage 'mac.03' failed with exception ${exc}. So we run additional steps.") - - stage('mac.08.libssl.libcrypto.build.sh') { - sh "./mac.08.libssl.libcrypto.build.sh" - } - - stage('mac.09.libzmq.libsodium.build.sh') { - sh "./mac.09.libzmq.libsodium.build.sh" - } - - stage('mac.10.libminiz.libsqlite3.combine.sh') { - sh "./mac.10.libminiz.libsqlite3.combine.sh" - } - } - } - stage('mac.14.libsovtoken.build.sh') { sh "./mac.14.libsovtoken.build.sh" } From a615156e93ea00b696183e00e46fadaa36d80e7b Mon Sep 17 00:00:00 2001 From: Felippe Burk Date: Wed, 12 Sep 2018 15:43:57 -0600 Subject: [PATCH 09/36] testing out new sovrinrepo push Signed-off-by: Felippe Burk --- devops/aws-codebuild/Jenkinsfile.cd | 2 +- devops/aws-codebuild/Jenkinsfile.ci | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/devops/aws-codebuild/Jenkinsfile.cd b/devops/aws-codebuild/Jenkinsfile.cd index 0cb288701..b540a5d80 100644 --- a/devops/aws-codebuild/Jenkinsfile.cd +++ b/devops/aws-codebuild/Jenkinsfile.cd @@ -1,6 +1,6 @@ #!groovy -def evLibrary = library(identifier: 'evernym-aws-codebuild@v0.2.0-aws-codebuild', retriever: modernSCM( +def evLibrary = library(identifier: 'evernym-aws-codebuild@v0.3.0-aws-codebuild', retriever: modernSCM( github(credentialsId: 'evernym-github-machine-user', repoOwner: 'evernym', repository: 'jenkins-shared') )).com.evernym.pipeline diff --git a/devops/aws-codebuild/Jenkinsfile.ci b/devops/aws-codebuild/Jenkinsfile.ci index 48852ed2e..679da55cd 100644 --- a/devops/aws-codebuild/Jenkinsfile.ci +++ b/devops/aws-codebuild/Jenkinsfile.ci @@ -1,6 +1,6 @@ #!groovy -def evLibrary = library(identifier: 'evernym-aws-codebuild@v0.2.0-aws-codebuild', retriever: modernSCM( +def evLibrary = library(identifier: 'evernym-aws-codebuild@v0.3.0-aws-codebuild', retriever: modernSCM( github(credentialsId: 'evernym-github-machine-user', repoOwner: 'evernym', repository: 'jenkins-shared') )).com.evernym.pipeline From 6a4bae11729fe112feddfbad2ad2024f6013f11c Mon Sep 17 00:00:00 2001 From: Felippe Burk Date: Wed, 12 Sep 2018 16:01:46 -0600 Subject: [PATCH 10/36] incrementing tag --- devops/aws-codebuild/Jenkinsfile.cd | 2 +- devops/aws-codebuild/Jenkinsfile.ci | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/devops/aws-codebuild/Jenkinsfile.cd b/devops/aws-codebuild/Jenkinsfile.cd index b540a5d80..9f44d2e2a 100644 --- a/devops/aws-codebuild/Jenkinsfile.cd +++ b/devops/aws-codebuild/Jenkinsfile.cd @@ -1,6 +1,6 @@ #!groovy -def evLibrary = library(identifier: 'evernym-aws-codebuild@v0.3.0-aws-codebuild', retriever: modernSCM( +def evLibrary = library(identifier: 'evernym-aws-codebuild@v0.4.0-aws-codebuild', retriever: modernSCM( github(credentialsId: 'evernym-github-machine-user', repoOwner: 'evernym', repository: 'jenkins-shared') )).com.evernym.pipeline diff --git a/devops/aws-codebuild/Jenkinsfile.ci b/devops/aws-codebuild/Jenkinsfile.ci index 679da55cd..260e15efd 100644 --- a/devops/aws-codebuild/Jenkinsfile.ci +++ b/devops/aws-codebuild/Jenkinsfile.ci @@ -1,6 +1,6 @@ #!groovy -def evLibrary = library(identifier: 'evernym-aws-codebuild@v0.3.0-aws-codebuild', retriever: modernSCM( +def evLibrary = library(identifier: 'evernym-aws-codebuild@v0.4.0-aws-codebuild', retriever: modernSCM( github(credentialsId: 'evernym-github-machine-user', repoOwner: 'evernym', repository: 'jenkins-shared') )).com.evernym.pipeline From add2c9259087c2064781fc45a5dcb48a6893018e Mon Sep 17 00:00:00 2001 From: Felippe Burk Date: Wed, 12 Sep 2018 16:38:25 -0600 Subject: [PATCH 11/36] incrementing tag --- devops/aws-codebuild/Jenkinsfile.cd | 2 +- devops/aws-codebuild/Jenkinsfile.ci | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/devops/aws-codebuild/Jenkinsfile.cd b/devops/aws-codebuild/Jenkinsfile.cd index 9f44d2e2a..a448c3073 100644 --- a/devops/aws-codebuild/Jenkinsfile.cd +++ b/devops/aws-codebuild/Jenkinsfile.cd @@ -1,6 +1,6 @@ #!groovy -def evLibrary = library(identifier: 'evernym-aws-codebuild@v0.4.0-aws-codebuild', retriever: modernSCM( +def evLibrary = library(identifier: 'evernym-aws-codebuild@v0.5.0-aws-codebuild', retriever: modernSCM( github(credentialsId: 'evernym-github-machine-user', repoOwner: 'evernym', repository: 'jenkins-shared') )).com.evernym.pipeline diff --git a/devops/aws-codebuild/Jenkinsfile.ci b/devops/aws-codebuild/Jenkinsfile.ci index 260e15efd..ca220f3f0 100644 --- a/devops/aws-codebuild/Jenkinsfile.ci +++ b/devops/aws-codebuild/Jenkinsfile.ci @@ -1,6 +1,6 @@ #!groovy -def evLibrary = library(identifier: 'evernym-aws-codebuild@v0.4.0-aws-codebuild', retriever: modernSCM( +def evLibrary = library(identifier: 'evernym-aws-codebuild@v0.5.0-aws-codebuild', retriever: modernSCM( github(credentialsId: 'evernym-github-machine-user', repoOwner: 'evernym', repository: 'jenkins-shared') )).com.evernym.pipeline From e34005bf287f1c69a23f158ec33e09b35a0beb39 Mon Sep 17 00:00:00 2001 From: Felippe Burk Date: Wed, 12 Sep 2018 16:55:59 -0600 Subject: [PATCH 12/36] incrementing tag --- devops/aws-codebuild/Jenkinsfile.cd | 2 +- devops/aws-codebuild/Jenkinsfile.ci | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/devops/aws-codebuild/Jenkinsfile.cd b/devops/aws-codebuild/Jenkinsfile.cd index a448c3073..f95494131 100644 --- a/devops/aws-codebuild/Jenkinsfile.cd +++ b/devops/aws-codebuild/Jenkinsfile.cd @@ -1,6 +1,6 @@ #!groovy -def evLibrary = library(identifier: 'evernym-aws-codebuild@v0.5.0-aws-codebuild', retriever: modernSCM( +def evLibrary = library(identifier: 'evernym-aws-codebuild@v0.6.0-aws-codebuild', retriever: modernSCM( github(credentialsId: 'evernym-github-machine-user', repoOwner: 'evernym', repository: 'jenkins-shared') )).com.evernym.pipeline diff --git a/devops/aws-codebuild/Jenkinsfile.ci b/devops/aws-codebuild/Jenkinsfile.ci index ca220f3f0..f578c945d 100644 --- a/devops/aws-codebuild/Jenkinsfile.ci +++ b/devops/aws-codebuild/Jenkinsfile.ci @@ -1,6 +1,6 @@ #!groovy -def evLibrary = library(identifier: 'evernym-aws-codebuild@v0.5.0-aws-codebuild', retriever: modernSCM( +def evLibrary = library(identifier: 'evernym-aws-codebuild@v0.6.0-aws-codebuild', retriever: modernSCM( github(credentialsId: 'evernym-github-machine-user', repoOwner: 'evernym', repository: 'jenkins-shared') )).com.evernym.pipeline From 016aad9b1e03c73a8bb55be8f8ee2138a94465cd Mon Sep 17 00:00:00 2001 From: Felippe Burk Date: Wed, 12 Sep 2018 17:57:21 -0600 Subject: [PATCH 13/36] incrementing tag --- devops/aws-codebuild/Jenkinsfile.cd | 2 +- devops/aws-codebuild/Jenkinsfile.ci | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/devops/aws-codebuild/Jenkinsfile.cd b/devops/aws-codebuild/Jenkinsfile.cd index f95494131..abcfb0446 100644 --- a/devops/aws-codebuild/Jenkinsfile.cd +++ b/devops/aws-codebuild/Jenkinsfile.cd @@ -1,6 +1,6 @@ #!groovy -def evLibrary = library(identifier: 'evernym-aws-codebuild@v0.6.0-aws-codebuild', retriever: modernSCM( +def evLibrary = library(identifier: 'evernym-aws-codebuild@v0.8.0-aws-codebuild', retriever: modernSCM( github(credentialsId: 'evernym-github-machine-user', repoOwner: 'evernym', repository: 'jenkins-shared') )).com.evernym.pipeline diff --git a/devops/aws-codebuild/Jenkinsfile.ci b/devops/aws-codebuild/Jenkinsfile.ci index f578c945d..6abda7d80 100644 --- a/devops/aws-codebuild/Jenkinsfile.ci +++ b/devops/aws-codebuild/Jenkinsfile.ci @@ -1,6 +1,6 @@ #!groovy -def evLibrary = library(identifier: 'evernym-aws-codebuild@v0.6.0-aws-codebuild', retriever: modernSCM( +def evLibrary = library(identifier: 'evernym-aws-codebuild@v0.8.0-aws-codebuild', retriever: modernSCM( github(credentialsId: 'evernym-github-machine-user', repoOwner: 'evernym', repository: 'jenkins-shared') )).com.evernym.pipeline From 6277f729973e79b0185f11c7e39ca59009dceb6d Mon Sep 17 00:00:00 2001 From: Felippe Burk Date: Wed, 12 Sep 2018 18:18:10 -0600 Subject: [PATCH 14/36] use vpc config --- devops/aws-codebuild/Jenkinsfile.cd | 3 +++ devops/aws-codebuild/Jenkinsfile.ci | 3 +++ 2 files changed, 6 insertions(+) diff --git a/devops/aws-codebuild/Jenkinsfile.cd b/devops/aws-codebuild/Jenkinsfile.cd index abcfb0446..55c82d2e0 100644 --- a/devops/aws-codebuild/Jenkinsfile.cd +++ b/devops/aws-codebuild/Jenkinsfile.cd @@ -343,6 +343,9 @@ def macOSPipeline = { } pipelineWrapper({ + //put code build containers inside a vpc under our dev account + env.USE_VPC_CONFIG = true + Map builds = [ codeBuild: [ build: codeBuildPipelines, diff --git a/devops/aws-codebuild/Jenkinsfile.ci b/devops/aws-codebuild/Jenkinsfile.ci index 6abda7d80..518143eb2 100644 --- a/devops/aws-codebuild/Jenkinsfile.ci +++ b/devops/aws-codebuild/Jenkinsfile.ci @@ -22,6 +22,9 @@ pipelineWrapper({ ] List goals = ['test_dry', 'test'] + //put code build containers inside a vpc under our dev account + env.USE_VPC_CONFIG = true + stage('Checkout from SCM') { checkout scm } From 179202c9f97c8b430b2ec702b4666e6d9464a958 Mon Sep 17 00:00:00 2001 From: Cam Parra Date: Wed, 12 Sep 2018 19:22:20 -0600 Subject: [PATCH 15/36] name changed to env and files updated with new name Signed-off-by: Cam Parra --- devops/aws-codebuild/Jenkinsfile.cd | 2 +- libsovtoken/build_scripts/ios/mac/README.md | 2 +- .../{mac.01.libindy.setup.sh => mac.01.env.setup.sh} | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) rename libsovtoken/build_scripts/ios/mac/{mac.01.libindy.setup.sh => mac.01.env.setup.sh} (98%) diff --git a/devops/aws-codebuild/Jenkinsfile.cd b/devops/aws-codebuild/Jenkinsfile.cd index 0f35c09d6..cd4d26174 100644 --- a/devops/aws-codebuild/Jenkinsfile.cd +++ b/devops/aws-codebuild/Jenkinsfile.cd @@ -292,7 +292,7 @@ def macOSPipeline = { dir('libsovtoken/build_scripts/ios/mac/') { stage('mac.01.libindy.setup') { - sh './mac.01.libindy.setup.sh' + sh './mac.01.env.setup.sh' } stage('mac.14.libsovtoken.build.sh') { diff --git a/libsovtoken/build_scripts/ios/mac/README.md b/libsovtoken/build_scripts/ios/mac/README.md index 4c75aeeb2..248cb8bf4 100644 --- a/libsovtoken/build_scripts/ios/mac/README.md +++ b/libsovtoken/build_scripts/ios/mac/README.md @@ -28,7 +28,7 @@ sudo xcodebuild -license --------------------------------------------------------------------------- 1. Checkout the libsovtoken project using https://github.com/evernym/libsovtoken.git or git@github.com:evernym/libsovtoken.git 1. Startup a terminal and cd into libsovtoken/libsovtoken/build_scripts/ios/mac -1. Run the script `./mac.01.libindy.setup.sh` (make sure the brew install commands are successful) +1. Run the script `./mac.01.env.setup.sh` (make sure the brew install commands are successful) * If it succeeded, run the command `rustc --print target-list|grep -i ios`. It should output: ```bash aarch64-apple-ios diff --git a/libsovtoken/build_scripts/ios/mac/mac.01.libindy.setup.sh b/libsovtoken/build_scripts/ios/mac/mac.01.env.setup.sh similarity index 98% rename from libsovtoken/build_scripts/ios/mac/mac.01.libindy.setup.sh rename to libsovtoken/build_scripts/ios/mac/mac.01.env.setup.sh index 8ec667060..74da11fae 100755 --- a/libsovtoken/build_scripts/ios/mac/mac.01.libindy.setup.sh +++ b/libsovtoken/build_scripts/ios/mac/mac.01.env.setup.sh @@ -44,7 +44,7 @@ fi if [[ $RUSTUP_VERSION =~ ^'rustup ' ]]; then rustup component add rls-preview rust-analysis rust-src - + rustup target remove aarch64-linux-android armv7-linux-androideabi arm-linux-androideabi i686-linux-android x86_64-linux-android rustup target add aarch64-apple-ios armv7-apple-ios armv7s-apple-ios x86_64-apple-ios i386-apple-ios @@ -58,18 +58,18 @@ if [[ $RUSTUP_VERSION =~ ^'rustup ' ]]; then cargo install cargo-lipo cargo install cargo-xcode - + BREW_VERSION=`brew --version` if ! [[ $BREW_VERSION =~ ^'Homebrew ' ]]; then /usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)" brew doctor brew update fi - + #2) Install required native libraries and utilities (libsodium is added with URL to homebrew since version<1.0.15 is required) brew install pkg-config - brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/65effd2b617bade68a8a2c5b39e1c3089cc0e945/Formula/libsodium.rb - brew install automake + brew install https://raw.githubusercontent.com/Homebrew/homebrew-core/65effd2b617bade68a8a2c5b39e1c3089cc0e945/Formula/libsodium.rb + brew install automake brew install autoconf brew install cmake brew install openssl From 6418f633d73de853ecc3f4344eebfd13c8c939f8 Mon Sep 17 00:00:00 2001 From: Felippe Burk Date: Thu, 13 Sep 2018 10:45:27 -0600 Subject: [PATCH 16/36] fixing call to sovrinRepo. Signed-off-by: Felippe Burk --- devops/aws-codebuild/Jenkinsfile.cd | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/devops/aws-codebuild/Jenkinsfile.cd b/devops/aws-codebuild/Jenkinsfile.cd index cd4d26174..705868ed0 100644 --- a/devops/aws-codebuild/Jenkinsfile.cd +++ b/devops/aws-codebuild/Jenkinsfile.cd @@ -33,6 +33,7 @@ def codeBuildPipelines = { } def evernymRepo = evLibrary.EvernymRepo.new(this) + def sovrinRepo = evLibrary.SovrinRepo.new(this) def git = evLibrary.Git.new(this) def buildCtx = evLibrary.AwsCodeBuildHelper.BuildCtx.new('libsovtoken') def awsCBHelper = evLibrary.AwsCodeBuildHelper.new(this, buildCtx) @@ -196,7 +197,7 @@ def codeBuildPipelines = { } } - stage('Upload deb to Evernym repo') { + stage('Upload deb to repositories') { String debName dir("${awsCBHelper.buildCtx.projects[prTag].artifactsDir}") { @@ -207,6 +208,14 @@ def codeBuildPipelines = { repoDistr = 'agency_dev' packagePath = debName } + + if (env.BRANCH_NAME == 'stable') { + logger.info("Uploading debian package '$debName' to sovrin repo") + sovrinRepo.upload { + repoDistr = 'sdk' + packagePath = debName + } + } } notifier.email { From c7c25506e4306fe76244067c1c497227f7ec86f1 Mon Sep 17 00:00:00 2001 From: Nikita Khateev Date: Fri, 14 Sep 2018 13:09:47 +0300 Subject: [PATCH 17/36] Pin CI and deb package to the stable version of libindy Signed-off-by: Nikita Khateev --- devops/Makefile | 2 +- devops/docker/base/xenial/Dockerfile | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/devops/Makefile b/devops/Makefile index 8ef00b330..8dace0117 100644 --- a/devops/Makefile +++ b/devops/Makefile @@ -45,7 +45,7 @@ FPM_P_VENDOR := Evernym FPM_P_DESCRIPTION := libsovtoken writen in Rust FPM_P_NAME = $(PACKAGE_NAME) FPM_P_VERSION ?= $(SRC_VERSION) -FPM_P_DEPENDS = libindy +FPM_P_DEPENDS = libindy(=1.6.6) FPM_P_OUTPUT_DIR = $(LIB_TARGET_DIR) FPM_ARGS = $(LIB_DYNAMIC)=/usr/lib/ diff --git a/devops/docker/base/xenial/Dockerfile b/devops/docker/base/xenial/Dockerfile index 8ce4ea6f1..4e8caf18b 100644 --- a/devops/docker/base/xenial/Dockerfile +++ b/devops/docker/base/xenial/Dockerfile @@ -21,11 +21,12 @@ RUN cd /tmp \ # need for libsodium to be reachable via pkg-config (sodiumoxide uses it) ENV PKG_CONFIG_PATH /usr/local/lib/pkgconfig:$PKG_CONFIG_PATH # TODO ??? is it really needed +ENV LIBINDY_VERSION=1.6.6 RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 68DB5E88 \ - && echo "deb https://repo.sovrin.org/sdk/deb xenial master" >> /etc/apt/sources.list \ + && echo "deb https://repo.sovrin.org/sdk/deb xenial stable" >> /etc/apt/sources.list \ && apt-get update && apt-get install -y --no-install-recommends \ libssl-dev \ - libindy \ + libindy=${LIBINDY_VERSION} \ && rm -rf /var/lib/apt/lists/* @@ -45,4 +46,4 @@ RUN cd /tmp/libsovtoken \ # TODO CMD ENTRYPOINT ... -ENV LIBSOVTOKEN_BASE_ENV_VERSION=0.8.0 +ENV LIBSOVTOKEN_BASE_ENV_VERSION=0.9.0 From 05671dca3ff800cd5290969c8ddf18e6e1c376f1 Mon Sep 17 00:00:00 2001 From: Nikita Khateev Date: Fri, 14 Sep 2018 13:27:55 +0300 Subject: [PATCH 18/36] revert dockerfile changes Signed-off-by: Nikita Khateev --- devops/docker/base/xenial/Dockerfile | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/devops/docker/base/xenial/Dockerfile b/devops/docker/base/xenial/Dockerfile index 4e8caf18b..8ce4ea6f1 100644 --- a/devops/docker/base/xenial/Dockerfile +++ b/devops/docker/base/xenial/Dockerfile @@ -21,12 +21,11 @@ RUN cd /tmp \ # need for libsodium to be reachable via pkg-config (sodiumoxide uses it) ENV PKG_CONFIG_PATH /usr/local/lib/pkgconfig:$PKG_CONFIG_PATH # TODO ??? is it really needed -ENV LIBINDY_VERSION=1.6.6 RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 68DB5E88 \ - && echo "deb https://repo.sovrin.org/sdk/deb xenial stable" >> /etc/apt/sources.list \ + && echo "deb https://repo.sovrin.org/sdk/deb xenial master" >> /etc/apt/sources.list \ && apt-get update && apt-get install -y --no-install-recommends \ libssl-dev \ - libindy=${LIBINDY_VERSION} \ + libindy \ && rm -rf /var/lib/apt/lists/* @@ -46,4 +45,4 @@ RUN cd /tmp/libsovtoken \ # TODO CMD ENTRYPOINT ... -ENV LIBSOVTOKEN_BASE_ENV_VERSION=0.9.0 +ENV LIBSOVTOKEN_BASE_ENV_VERSION=0.8.0 From 88b53a352bce483216b11e4b128a6538d050b413 Mon Sep 17 00:00:00 2001 From: Nikita Khateev Date: Fri, 14 Sep 2018 13:35:12 +0300 Subject: [PATCH 19/36] Revert "revert dockerfile changes" This reverts commit 05671dc Signed-off-by: Nikita Khateev --- devops/docker/base/xenial/Dockerfile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/devops/docker/base/xenial/Dockerfile b/devops/docker/base/xenial/Dockerfile index 8ce4ea6f1..4e8caf18b 100644 --- a/devops/docker/base/xenial/Dockerfile +++ b/devops/docker/base/xenial/Dockerfile @@ -21,11 +21,12 @@ RUN cd /tmp \ # need for libsodium to be reachable via pkg-config (sodiumoxide uses it) ENV PKG_CONFIG_PATH /usr/local/lib/pkgconfig:$PKG_CONFIG_PATH # TODO ??? is it really needed +ENV LIBINDY_VERSION=1.6.6 RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 68DB5E88 \ - && echo "deb https://repo.sovrin.org/sdk/deb xenial master" >> /etc/apt/sources.list \ + && echo "deb https://repo.sovrin.org/sdk/deb xenial stable" >> /etc/apt/sources.list \ && apt-get update && apt-get install -y --no-install-recommends \ libssl-dev \ - libindy \ + libindy=${LIBINDY_VERSION} \ && rm -rf /var/lib/apt/lists/* @@ -45,4 +46,4 @@ RUN cd /tmp/libsovtoken \ # TODO CMD ENTRYPOINT ... -ENV LIBSOVTOKEN_BASE_ENV_VERSION=0.8.0 +ENV LIBSOVTOKEN_BASE_ENV_VERSION=0.9.0 From 2bff6a63992ec08383b76db9b9cd613cc6369c05 Mon Sep 17 00:00:00 2001 From: Nikita Khateev Date: Fri, 14 Sep 2018 15:31:18 +0300 Subject: [PATCH 20/36] Fix the identifier in GET_UTXO request Signed-off-by: Nikita Khateev --- libsovtoken/src/api/mod.rs | 24 ++++--------------- .../src/logic/config/get_utxo_config.rs | 12 ++++------ .../build_get_utxo_request_handler_test.rs | 24 +++++++++++++++++++ 3 files changed, 33 insertions(+), 27 deletions(-) diff --git a/libsovtoken/src/api/mod.rs b/libsovtoken/src/api/mod.rs index cba81a22b..0b5319a95 100644 --- a/libsovtoken/src/api/mod.rs +++ b/libsovtoken/src/api/mod.rs @@ -451,7 +451,7 @@ pub extern "C" fn parse_payment_response_handler( #[no_mangle] pub extern "C" fn build_get_utxo_request_handler(command_handle: i32, wallet_handle: i32, - submitter_did: *const c_char, + _submitter_did: *const c_char, payment_address: *const c_char, cb: JsonCallback)-> i32 { trace!("api::build_get_utxo_request_handler called"); @@ -464,26 +464,10 @@ pub extern "C" fn build_get_utxo_request_handler(command_handle: i32, return ErrorCode::CommonInvalidStructure as i32; } }; + debug!("api::build_get_utxo_request_handler >> wallet_handle: {:?}, payment_address: {:?}", wallet_handle, payment_address); - let did = match Did::from_pointer(submitter_did) { - Some(did) => did, - None => { - error!("Failed to convert submitter_did pointer to string"); - return ErrorCode::CommonInvalidStructure as i32 - } - }; - - debug!("api::build_get_utxo_request_handler >> wallet_handle: {:?}, submitter_did: {:?}, payment_address: {:?}", wallet_handle, did, payment_address); - - let did = match did.validate() { - Ok(did_valid) => did_valid, - Err(_) => { - trace!("api::build_get_utxo_request_handler << result: {:?}", ErrorCode::CommonInvalidStructure); - return ErrorCode::CommonInvalidStructure as i32 - } - }; - - let utxo_request = GetUtxoOperationRequest::new(String::from(payment_address), did.into()); + let utxo_request = + GetUtxoOperationRequest::new(String::from(payment_address)); info!("Built GET_UTXO request: {:?}", utxo_request); let utxo_request = utxo_request.serialize_to_pointer() .map_err(|_| ErrorCode::CommonInvalidStructure); diff --git a/libsovtoken/src/logic/config/get_utxo_config.rs b/libsovtoken/src/logic/config/get_utxo_config.rs index d4b4e28c1..a89b6d8eb 100644 --- a/libsovtoken/src/logic/config/get_utxo_config.rs +++ b/libsovtoken/src/logic/config/get_utxo_config.rs @@ -6,9 +6,9 @@ */ use logic::address::strip_qualifier_from_address; -use logic::did::Did; use logic::request::Request; use utils::constants::txn_types::GET_UTXO; +use logic::address::verkey_from_unqualified_address; /** * Json config to customize [`build_get_utxo_txn_handler`] @@ -23,13 +23,14 @@ pub struct GetUtxoOperationRequest { } impl GetUtxoOperationRequest { - pub fn new(address : String, identifier : Did) -> Request { + pub fn new(address : String) -> Request { let unqualified_address: String = strip_qualifier_from_address(&address); + let identifier = verkey_from_unqualified_address(&unqualified_address).ok(); let req = GetUtxoOperationRequest { address : unqualified_address, req_type : GET_UTXO.to_string(), }; - return Request::new(req, Some(String::from(identifier))); + return Request::new(req, identifier); } } @@ -38,7 +39,6 @@ impl GetUtxoOperationRequest { mod get_utxo_config_tests { use logic::address::{qualified_address_from_verkey, verkey_from_unqualified_address}; - use logic::did::Did; use utils::logger::init_log; use super::*; @@ -50,13 +50,11 @@ mod get_utxo_config_tests { let ver_key: String = "EFfodscoymgdJDuM885uEWmgCcA25P6VR6TjVqsYZLW3".to_string(); let payment_address: String = qualified_address_from_verkey(&ver_key).unwrap(); - let did: Did = Did::new("2jyMWLv8NuxUV4yDc46mLQMn9WUUzeKURX3d2yQqgoLqEQC2sf"); - let utxo_request = GetUtxoOperationRequest::new(String::from(payment_address), did.into()); + let utxo_request = GetUtxoOperationRequest::new(String::from(payment_address)); trace!("utxo_request => {:?}", utxo_request); assert_eq!(ver_key, verkey_from_unqualified_address(&utxo_request.operation.address).unwrap()); } - } \ No newline at end of file diff --git a/libsovtoken/tests/build_get_utxo_request_handler_test.rs b/libsovtoken/tests/build_get_utxo_request_handler_test.rs index 78730b829..672750189 100644 --- a/libsovtoken/tests/build_get_utxo_request_handler_test.rs +++ b/libsovtoken/tests/build_get_utxo_request_handler_test.rs @@ -6,6 +6,8 @@ extern crate rust_libindy_wrapper as indy; mod utils; use utils::wallet::Wallet; use utils::setup::{Setup, SetupConfig}; +use sovtoken::logic::address::strip_qualifier_from_address; +use sovtoken::logic::address::verkey_from_unqualified_address; #[test] pub fn build_and_submit_get_utxo_request() { @@ -52,4 +54,26 @@ pub fn build_and_submit_get_utxo_request_no_utxo() { let res_parsed: Vec = serde_json::from_str(&res).unwrap(); assert_eq!(res_parsed.len(), 0); +} + +#[test] +pub fn payment_address_is_identifier() { + let wallet = Wallet::new(); + let setup = Setup::new(&wallet, SetupConfig { + num_addresses: 1, + num_trustees: 1, + num_users: 0, + mint_tokens: None, + fees: None, + }); + let payment_addresses = &setup.addresses; + let dids = setup.trustees.dids(); + + let (get_utxo_req, _) = indy::payments::Payment::build_get_payment_sources_request(wallet.handle, dids[0], &payment_addresses[0]).unwrap(); + let req : serde_json::Value = serde_json::from_str(&get_utxo_req).unwrap(); + let identifier = req.as_object().unwrap().get("identifier").unwrap().as_str().unwrap(); + let unqualified_addr = strip_qualifier_from_address(&payment_addresses[0]); + let unqualified_addr = verkey_from_unqualified_address(&unqualified_addr).unwrap(); + assert_eq!(identifier, unqualified_addr); + assert_ne!(identifier, dids[0]); } \ No newline at end of file From 2711c6b9a347bfc4451447d272b548d516ea52dd Mon Sep 17 00:00:00 2001 From: Nikita Khateev Date: Fri, 14 Sep 2018 18:04:03 +0300 Subject: [PATCH 21/36] Add "Set fees process" doc Signed-off-by: Nikita Khateev --- doc/set_fees_process.md | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 doc/set_fees_process.md diff --git a/doc/set_fees_process.md b/doc/set_fees_process.md new file mode 100644 index 000000000..1d4ebc82c --- /dev/null +++ b/doc/set_fees_process.md @@ -0,0 +1,38 @@ +# Setting fees process + +It will be explained on an example of Indy CLI. + +### Prerequisites + +* libindy +* Indy CLI +* libsovtoken +* Wallet with Trustee DID +* Created pool in Indy CLI + +### Creating a SET_FEES transaction. + +* Open `indy-cli` +* Open wallet: `wallet open key=` +* Load libsovtoken: `load-plugin library=libsovtoken.[so|dll] initializer=sovtoken_init` +* Make a transaction with a command `ledger set-fees-prepare payment_method=sov fees=NYM:1` to set fees to 1 sovatom for NYM + +Indy CLI will print the transaction after these steps. + +### Putting your signature on a prepared request + +* Open `indy-cli` +* Load libsovtoken: `load-plugin library=libsovtoken.[so|dll] initializer=sovtoken_init` +* Open your wallet: `wallet open key=` +* Use your did: `did use ` +* Sign the transaction you created or received: `ledger sign-multi txn=` + +Indy CLI will print the transaction with your signature after these steps. + +### Sending the signed transaction to the ledger + +* Open `indy-cli` +* Connect to the pool: `pool connect ` +* Send transaction: `ledger custom ` + +Received ledger reply json will be printed in cli \ No newline at end of file From bcc1a0cbba46c291cdeae6f997a5f62dc7be5b51 Mon Sep 17 00:00:00 2001 From: Nikita Khateev Date: Fri, 14 Sep 2018 18:17:01 +0300 Subject: [PATCH 22/36] Add guide to Indy CLI commands Signed-off-by: Nikita Khateev --- doc/set_fees_process.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/doc/set_fees_process.md b/doc/set_fees_process.md index 1d4ebc82c..3f8f14860 100644 --- a/doc/set_fees_process.md +++ b/doc/set_fees_process.md @@ -10,6 +10,8 @@ It will be explained on an example of Indy CLI. * Wallet with Trustee DID * Created pool in Indy CLI +[Small guide](https://github.com/hyperledger/indy-sdk/tree/master/doc/design/001-cli#commands) to Indy CLI commands: + ### Creating a SET_FEES transaction. * Open `indy-cli` From d541492600b963209c33578cda9cf621ce77ecd8 Mon Sep 17 00:00:00 2001 From: Felippe Burk Date: Fri, 14 Sep 2018 09:40:23 -0600 Subject: [PATCH 23/36] fixing pipeline upload to sovrin repo Signed-off-by: Felippe Burk --- devops/aws-codebuild/Jenkinsfile.cd | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/devops/aws-codebuild/Jenkinsfile.cd b/devops/aws-codebuild/Jenkinsfile.cd index 705868ed0..329ce996e 100644 --- a/devops/aws-codebuild/Jenkinsfile.cd +++ b/devops/aws-codebuild/Jenkinsfile.cd @@ -19,6 +19,10 @@ def nodeLabels = [ def codeBuildPipelines = { def packageName = 'libsovtoken' + //put code build containers inside a vpc under our dev account + env.USE_VPC_CONFIG = true + env.SOVRIN_REPO_HOST = '192.168.11.115' + List _envBuildSrc = [ 'devops', 'libsovtoken/Cargo.toml', @@ -210,11 +214,14 @@ def codeBuildPipelines = { } if (env.BRANCH_NAME == 'stable') { - logger.info("Uploading debian package '$debName' to sovrin repo") - sovrinRepo.upload { - repoDistr = 'sdk' - packagePath = debName - } + logger.info("Uploading debian package '$debName' to sovrin repo") + sshagent(credentials: ['SovrinRepoSSHKey']) { + sovrinRepo.upload { + repoDistr = 'sdk' + packagePath = debName + component = 'rc' + } + } } } From d94af2e3d959da1b19eb03a6b1c3072abdeafb7c Mon Sep 17 00:00:00 2001 From: Nikita Khateev Date: Fri, 14 Sep 2018 18:51:23 +0300 Subject: [PATCH 24/36] Add expected outputs Signed-off-by: Nikita Khateev --- doc/set_fees_process.md | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/doc/set_fees_process.md b/doc/set_fees_process.md index 3f8f14860..99edbc84e 100644 --- a/doc/set_fees_process.md +++ b/doc/set_fees_process.md @@ -17,9 +17,13 @@ It will be explained on an example of Indy CLI. * Open `indy-cli` * Open wallet: `wallet open key=` * Load libsovtoken: `load-plugin library=libsovtoken.[so|dll] initializer=sovtoken_init` -* Make a transaction with a command `ledger set-fees-prepare payment_method=sov fees=NYM:1` to set fees to 1 sovatom for NYM +* Make a transaction with a command `ledger set-fees-prepare payment_method=sov fees=NYM:1,ATTRIB:2` to set fees to 1 sovatom for NYM and 2 sovatoms for ATTRIB -Indy CLI will print the transaction after these steps. +Indy CLI will print the transaction after these steps. Expected output: + +```json +{"operation":{"type":"20000","fees":{"10001":2,"1":1}},"reqId":3782930813,"protocolVersion":2,"identifier":"V4SGRU86Z58d6TV7PBUe6f"} +``` ### Putting your signature on a prepared request @@ -29,7 +33,11 @@ Indy CLI will print the transaction after these steps. * Use your did: `did use ` * Sign the transaction you created or received: `ledger sign-multi txn=` -Indy CLI will print the transaction with your signature after these steps. +Indy CLI will print the transaction with your signature after these steps. Expected output: + +```json +{"identifier":"V4SGRU86Z58d6TV7PBUe6f","operation":{"fees":{"1":1,"10001":2},"type":"20000"},"protocolVersion":2,"reqId":3782930813,"signatures":{"V4SGRU86Z58d6TV7PBUe6f":"DpiKv5n5es9yTkPv1py8mMb6PtL1tWrYdpVS9qp5bJ6GtNPRfNME8ThAbxW7hFbAPfsDzQsBMMEarJ4qDS4CgEF"}} +``` ### Sending the signed transaction to the ledger @@ -37,4 +45,8 @@ Indy CLI will print the transaction with your signature after these steps. * Connect to the pool: `pool connect ` * Send transaction: `ledger custom ` -Received ledger reply json will be printed in cli \ No newline at end of file +Received ledger reply json will be printed in cli. Expected output: + +```json +{"op":"REPLY","result":{"txn":{"type":"20000","metadata":{"from":"V4SGRU86Z58d6TV7PBUe6f","reqId":3782930813,"digest":"94952d32bd83f1b63fed28cb502b704fd225cb02dca3cb02f4ebab94f2168370"},"data":{"fees":{"1":1,"10001":2}},"protocolVersion":2},"reqSignature":{"type":"ED25519","values":[{"value":"CFvstbmLLbWL2dtNxPiDkSR2v4aB7ADX41t3hVk4uvsnjVRXSFSwGs7KXcVdVQU9Qgzpp7moLdfKbjsD2QbwW8q","from":"4kyq92WXWVPKARnou6kWr7"},{"value":"YsNUcj1Hkpjfiykqs4C2nRqr8P8Xet2AZthQWgtjKEFxotYR99zHXQxRTBfzD4BRzUx7eL19HvrGdP495wmcrAb","from":"FT5Rx4RZZrVF1SjXtwcX7g"},{"value":"DpiKv5n5es9yTkPv1py8mMb6PtL1tWrYdpVS9qp5bJ6GtNPRfNME8ThAbxW7hFbAPfsDzQsBMMEarJ4qDS4CgEF","from":"V4SGRU86Z58d6TV7PBUe6f"}]},"auditPath":["FXoJDLDmTtc8x4FuNUZyazMTnHeEdqRMrkqiaUg9BivZ","hya3KgvwSti8uwbMv3h4yog6pu7ufSaM37EQFoikyp5","SmgEKUnFjZhC4FbaGwVfipvQMVyHyDW4BxzLSWYhkY2","Hf3CrReW4qNNGrShjpru6VLkfr5eCQn1YCYtuTePX3BD","3JxvbWb6zv7Vsj152frDKezsMGEwgjxCu6AcbPhZM5rq"],"ver":"1","rootHash":"Fg8uKJozQUAgKhjLvNTdPk3ZbduhjRju9pVjcyvXo8n2","txnMetadata":{"txnTime":1536940234,"seqNo":317}}} +``` \ No newline at end of file From 6eff785a27a2aa0550929adedb9e2f6ba3238376 Mon Sep 17 00:00:00 2001 From: Nikita Khateev Date: Fri, 14 Sep 2018 18:53:28 +0300 Subject: [PATCH 25/36] Change wording Signed-off-by: Nikita Khateev --- doc/set_fees_process.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/set_fees_process.md b/doc/set_fees_process.md index 99edbc84e..64c5bc640 100644 --- a/doc/set_fees_process.md +++ b/doc/set_fees_process.md @@ -19,7 +19,7 @@ It will be explained on an example of Indy CLI. * Load libsovtoken: `load-plugin library=libsovtoken.[so|dll] initializer=sovtoken_init` * Make a transaction with a command `ledger set-fees-prepare payment_method=sov fees=NYM:1,ATTRIB:2` to set fees to 1 sovatom for NYM and 2 sovatoms for ATTRIB -Indy CLI will print the transaction after these steps. Expected output: +Indy CLI will print the transaction after these steps. Example output: ```json {"operation":{"type":"20000","fees":{"10001":2,"1":1}},"reqId":3782930813,"protocolVersion":2,"identifier":"V4SGRU86Z58d6TV7PBUe6f"} @@ -33,7 +33,7 @@ Indy CLI will print the transaction after these steps. Expected output: * Use your did: `did use ` * Sign the transaction you created or received: `ledger sign-multi txn=` -Indy CLI will print the transaction with your signature after these steps. Expected output: +Indy CLI will print the transaction with your signature after these steps. Example output: ```json {"identifier":"V4SGRU86Z58d6TV7PBUe6f","operation":{"fees":{"1":1,"10001":2},"type":"20000"},"protocolVersion":2,"reqId":3782930813,"signatures":{"V4SGRU86Z58d6TV7PBUe6f":"DpiKv5n5es9yTkPv1py8mMb6PtL1tWrYdpVS9qp5bJ6GtNPRfNME8ThAbxW7hFbAPfsDzQsBMMEarJ4qDS4CgEF"}} @@ -45,7 +45,7 @@ Indy CLI will print the transaction with your signature after these steps. Expec * Connect to the pool: `pool connect ` * Send transaction: `ledger custom ` -Received ledger reply json will be printed in cli. Expected output: +Received ledger reply json will be printed in cli. Example output: ```json {"op":"REPLY","result":{"txn":{"type":"20000","metadata":{"from":"V4SGRU86Z58d6TV7PBUe6f","reqId":3782930813,"digest":"94952d32bd83f1b63fed28cb502b704fd225cb02dca3cb02f4ebab94f2168370"},"data":{"fees":{"1":1,"10001":2}},"protocolVersion":2},"reqSignature":{"type":"ED25519","values":[{"value":"CFvstbmLLbWL2dtNxPiDkSR2v4aB7ADX41t3hVk4uvsnjVRXSFSwGs7KXcVdVQU9Qgzpp7moLdfKbjsD2QbwW8q","from":"4kyq92WXWVPKARnou6kWr7"},{"value":"YsNUcj1Hkpjfiykqs4C2nRqr8P8Xet2AZthQWgtjKEFxotYR99zHXQxRTBfzD4BRzUx7eL19HvrGdP495wmcrAb","from":"FT5Rx4RZZrVF1SjXtwcX7g"},{"value":"DpiKv5n5es9yTkPv1py8mMb6PtL1tWrYdpVS9qp5bJ6GtNPRfNME8ThAbxW7hFbAPfsDzQsBMMEarJ4qDS4CgEF","from":"V4SGRU86Z58d6TV7PBUe6f"}]},"auditPath":["FXoJDLDmTtc8x4FuNUZyazMTnHeEdqRMrkqiaUg9BivZ","hya3KgvwSti8uwbMv3h4yog6pu7ufSaM37EQFoikyp5","SmgEKUnFjZhC4FbaGwVfipvQMVyHyDW4BxzLSWYhkY2","Hf3CrReW4qNNGrShjpru6VLkfr5eCQn1YCYtuTePX3BD","3JxvbWb6zv7Vsj152frDKezsMGEwgjxCu6AcbPhZM5rq"],"ver":"1","rootHash":"Fg8uKJozQUAgKhjLvNTdPk3ZbduhjRju9pVjcyvXo8n2","txnMetadata":{"txnTime":1536940234,"seqNo":317}}} From 97f17cdd5302e8bae46a57e6339ac1552dad05d1 Mon Sep 17 00:00:00 2001 From: Nikita Khateev Date: Fri, 14 Sep 2018 19:13:46 +0300 Subject: [PATCH 26/36] Add comments about the signing process Signed-off-by: Nikita Khateev --- doc/set_fees_process.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/doc/set_fees_process.md b/doc/set_fees_process.md index 64c5bc640..98b7313a7 100644 --- a/doc/set_fees_process.md +++ b/doc/set_fees_process.md @@ -27,6 +27,8 @@ Indy CLI will print the transaction after these steps. Example output: ### Putting your signature on a prepared request +This step should be made by multiple trustees. + * Open `indy-cli` * Load libsovtoken: `load-plugin library=libsovtoken.[so|dll] initializer=sovtoken_init` * Open your wallet: `wallet open key=` @@ -39,6 +41,8 @@ Indy CLI will print the transaction with your signature after these steps. Examp {"identifier":"V4SGRU86Z58d6TV7PBUe6f","operation":{"fees":{"1":1,"10001":2},"type":"20000"},"protocolVersion":2,"reqId":3782930813,"signatures":{"V4SGRU86Z58d6TV7PBUe6f":"DpiKv5n5es9yTkPv1py8mMb6PtL1tWrYdpVS9qp5bJ6GtNPRfNME8ThAbxW7hFbAPfsDzQsBMMEarJ4qDS4CgEF"}} ``` +The output should be send to the next trustee to sign it. + ### Sending the signed transaction to the ledger * Open `indy-cli` From 5e664acc4ac390adf27cdb9d22d47f1238838ec8 Mon Sep 17 00:00:00 2001 From: Felippe Burk Date: Fri, 14 Sep 2018 10:27:54 -0600 Subject: [PATCH 27/36] fixing version of aws-codebuild library Signed-off-by: Felippe Burk --- devops/aws-codebuild/Jenkinsfile.cd | 2 +- devops/aws-codebuild/Jenkinsfile.ci | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/devops/aws-codebuild/Jenkinsfile.cd b/devops/aws-codebuild/Jenkinsfile.cd index 329ce996e..9b039cfd6 100644 --- a/devops/aws-codebuild/Jenkinsfile.cd +++ b/devops/aws-codebuild/Jenkinsfile.cd @@ -1,6 +1,6 @@ #!groovy -def evLibrary = library(identifier: 'evernym-aws-codebuild@v0.8.0-aws-codebuild', retriever: modernSCM( +def evLibrary = library(identifier: 'evernym-aws-codebuild@v0.3.1-aws-codebuild', retriever: modernSCM( github(credentialsId: 'evernym-github-machine-user', repoOwner: 'evernym', repository: 'jenkins-shared') )).com.evernym.pipeline diff --git a/devops/aws-codebuild/Jenkinsfile.ci b/devops/aws-codebuild/Jenkinsfile.ci index 518143eb2..3035ba252 100644 --- a/devops/aws-codebuild/Jenkinsfile.ci +++ b/devops/aws-codebuild/Jenkinsfile.ci @@ -1,6 +1,6 @@ #!groovy -def evLibrary = library(identifier: 'evernym-aws-codebuild@v0.8.0-aws-codebuild', retriever: modernSCM( +def evLibrary = library(identifier: 'evernym-aws-codebuild@v0.3.1-aws-codebuild', retriever: modernSCM( github(credentialsId: 'evernym-github-machine-user', repoOwner: 'evernym', repository: 'jenkins-shared') )).com.evernym.pipeline From 51872a22668df535a68f8be919bea2d652431e68 Mon Sep 17 00:00:00 2001 From: Felippe Burk Date: Fri, 14 Sep 2018 10:41:36 -0600 Subject: [PATCH 28/36] fixing tag to be 0.3.0 Signed-off-by: Felippe Burk --- devops/aws-codebuild/Jenkinsfile.cd | 2 +- devops/aws-codebuild/Jenkinsfile.ci | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/devops/aws-codebuild/Jenkinsfile.cd b/devops/aws-codebuild/Jenkinsfile.cd index 9b039cfd6..871fd9cf2 100644 --- a/devops/aws-codebuild/Jenkinsfile.cd +++ b/devops/aws-codebuild/Jenkinsfile.cd @@ -1,6 +1,6 @@ #!groovy -def evLibrary = library(identifier: 'evernym-aws-codebuild@v0.3.1-aws-codebuild', retriever: modernSCM( +def evLibrary = library(identifier: 'evernym-aws-codebuild@v0.3.0-aws-codebuild', retriever: modernSCM( github(credentialsId: 'evernym-github-machine-user', repoOwner: 'evernym', repository: 'jenkins-shared') )).com.evernym.pipeline diff --git a/devops/aws-codebuild/Jenkinsfile.ci b/devops/aws-codebuild/Jenkinsfile.ci index 3035ba252..291686f96 100644 --- a/devops/aws-codebuild/Jenkinsfile.ci +++ b/devops/aws-codebuild/Jenkinsfile.ci @@ -1,6 +1,6 @@ #!groovy -def evLibrary = library(identifier: 'evernym-aws-codebuild@v0.3.1-aws-codebuild', retriever: modernSCM( +def evLibrary = library(identifier: 'evernym-aws-codebuild@v0.3.0-aws-codebuild', retriever: modernSCM( github(credentialsId: 'evernym-github-machine-user', repoOwner: 'evernym', repository: 'jenkins-shared') )).com.evernym.pipeline From eb58cb47b005d5eefe6a5130f03825fcb657723c Mon Sep 17 00:00:00 2001 From: Nikita Khateev Date: Mon, 17 Sep 2018 12:44:53 +0300 Subject: [PATCH 29/36] Push CI version Signed-off-by: Nikita Khateev --- devops/docker/ci/xenial/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devops/docker/ci/xenial/Dockerfile b/devops/docker/ci/xenial/Dockerfile index 3913f31ba..7d74a8e0c 100644 --- a/devops/docker/ci/xenial/Dockerfile +++ b/devops/docker/ci/xenial/Dockerfile @@ -90,4 +90,4 @@ COPY libsovtoken-ci-entrypoint.sh /usr/local/bin/ RUN chmod +x /usr/local/bin/libsovtoken-ci-entrypoint.sh ENTRYPOINT ["libsovtoken-ci-entrypoint.sh"] -ENV LIBSOVTOKEN_CI_ENV_VERSION=0.41.0 +ENV LIBSOVTOKEN_CI_ENV_VERSION=0.42.0 From 4d8e9a1046d5202f06fbb230fbaa2c042ca5dac2 Mon Sep 17 00:00:00 2001 From: Nikita Khateev Date: Mon, 17 Sep 2018 12:52:22 +0300 Subject: [PATCH 30/36] Push CI version Signed-off-by: Nikita Khateev --- devops/docker/ci/xenial/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devops/docker/ci/xenial/Dockerfile b/devops/docker/ci/xenial/Dockerfile index 7d74a8e0c..0afd1640f 100644 --- a/devops/docker/ci/xenial/Dockerfile +++ b/devops/docker/ci/xenial/Dockerfile @@ -1,4 +1,4 @@ -FROM evernym/libsovtoken:base-xenial-0.8.0 +FROM evernym/libsovtoken:base-xenial-0.9.0 # TODO LABEL maintainer="Name " ARG LIBINDY_CRYPTO_VERSION From 18336ee3e46acd2f7e369c1049e69ceea7d1f12e Mon Sep 17 00:00:00 2001 From: Devin Fisher Date: Mon, 17 Sep 2018 09:37:53 -0600 Subject: [PATCH 31/36] witch to use crates.io version of bs58 Signed-off-by: Devin Fisher --- libsovtoken/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libsovtoken/Cargo.toml b/libsovtoken/Cargo.toml index 7ec7dabc0..af50384d3 100644 --- a/libsovtoken/Cargo.toml +++ b/libsovtoken/Cargo.toml @@ -18,6 +18,7 @@ path = "src/lib.rs" crate-type = ["staticlib", "rlib", "cdylib"] [dependencies] +bs58 = {version="0.2.2", features = ["check"]} base64 = "0.6.0" env_logger = "0.5.10" hex = "0.2.0" @@ -27,7 +28,6 @@ log = "0.4.1" log-panics = "2.0.0" openssl = "0.9.24" rand = "0.4.2" -bs58 = { git = "https://github.com/evernym/bs58-rs.git", branch = "master", features = ["check"] } rust-libindy-wrapper = "0.2.13" serde = "1.0" serde_derive = "1.0" From 46c36812af379d4a32f8794cc65170e93101c3a5 Mon Sep 17 00:00:00 2001 From: Cam Parra Date: Tue, 18 Sep 2018 06:59:38 -0600 Subject: [PATCH 32/36] release 0.9.3 Signed-off-by: Cam Parra --- CHANGELOG.md | 10 ++++++++-- devops/docker/ci/xenial/Dockerfile | 2 +- devops/indy-pool/Dockerfile | 19 ++++++------------- libsovtoken/Cargo.toml | 2 +- .../libsovtoken/libsovtoken.dependencies.txt | 2 +- .../build_scripts/ios/mac/shared.functions.sh | 2 +- 6 files changed, 18 insertions(+), 19 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 9cf18bd78..549a34e7b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog - +## 0.9.3 +* Changed CI/CD to new stable branch. +* CD added to the new stable branch with new stable release process +* Source code is now public Sovrin repository +* changed base-58 library dependency. +* changed rust-indy-sdk dependency to rust crate +* bugfixes ## 0.9.2 * Android and iOS builds in CD pipeline * Changed transactions to use JSON objects rather than unlabeled arrays @@ -35,4 +41,4 @@ Note: This release requires the user to have libindy installed locally from [the ## 0.7.0 -Initial release \ No newline at end of file +Initial release diff --git a/devops/docker/ci/xenial/Dockerfile b/devops/docker/ci/xenial/Dockerfile index 0afd1640f..0833247ae 100644 --- a/devops/docker/ci/xenial/Dockerfile +++ b/devops/docker/ci/xenial/Dockerfile @@ -90,4 +90,4 @@ COPY libsovtoken-ci-entrypoint.sh /usr/local/bin/ RUN chmod +x /usr/local/bin/libsovtoken-ci-entrypoint.sh ENTRYPOINT ["libsovtoken-ci-entrypoint.sh"] -ENV LIBSOVTOKEN_CI_ENV_VERSION=0.42.0 +ENV LIBSOVTOKEN_CI_ENV_VERSION=0.43.0 diff --git a/devops/indy-pool/Dockerfile b/devops/indy-pool/Dockerfile index d119e84ed..9c4e78cec 100644 --- a/devops/indy-pool/Dockerfile +++ b/devops/indy-pool/Dockerfile @@ -52,30 +52,23 @@ RUN useradd -m -d /home/indy -s /bin/bash -p $(openssl passwd -1 "token") -u $ui ARG indy_stream=stable ARG indy_anoncreds_ver=1.0.11 -ARG python3_indy_crypto_ver=0.4.1 -ARG indy_crypto_ver=0.4.0 +ARG python3_indy_crypto_ver=0.4.3 +ARG indy_crypto_ver=0.4.3 +ARG indy_plenum_ver=1.6.51 +ARG indy_node_ver=1.6.73 -ARG sovtoken_pkg_name=sovtoken_0.8.0_amd64.deb -ARG sovtokenfees_pkg_name=sovtokenfees_0.8.0_amd64.deb RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 68DB5E88 RUN echo "deb https://repo.sovrin.org/deb xenial $indy_stream" >> /etc/apt/sources.list RUN apt-get update -y && apt-get install -y \ - indy-plenum \ - indy-node \ + indy-plenum=${indy_plenum_ver}\ + indy-node=${indy_node_ver} \ indy-anoncreds=${indy_anoncreds_ver} \ python3-indy-crypto=${python3_indy_crypto_ver} \ libindy-crypto=${indy_crypto_ver} \ vim sudo -RUN mkdir -p /usr/local/share/ca-certificates -RUN curl -k https://repo.corp.evernym.com/ca.crt | tee /usr/local/share/ca-certificates/Evernym_Root_CA.crt -RUN update-ca-certificates -RUN echo "10.2.3.179 repo.corp.evernym.com" >>/etc/hosts -RUN update-ca-certificates -RUN curl https://repo.corp.evernym.com/repo.corp.evenym.com-sig.key | apt-key add - -RUN echo 'deb https://repo.corp.evernym.com/deb evernym-agency-dev-ubuntu main' | tee /etc/apt/sources.list.d/agency-dev_repo.corp.evernym.com.list RUN apt-get update && apt-get install -y --no-install-recommends \ sovtoken \ diff --git a/libsovtoken/Cargo.toml b/libsovtoken/Cargo.toml index af50384d3..883b35167 100644 --- a/libsovtoken/Cargo.toml +++ b/libsovtoken/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "libsovtoken" -version = "0.9.2" +version = "0.9.3" authors = [ "Matt Raffel Date: Tue, 18 Sep 2018 08:19:48 -0600 Subject: [PATCH 33/36] libsovtoken points to repo.sovrin.org rc artifact repo Signed-off-by: Cam Parra --- CHANGELOG.md | 1 + devops/aws-codebuild/Jenkinsfile.ci | 8 ++++---- devops/docker/ci/xenial/Dockerfile | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 549a34e7b..6c92e7656 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,7 @@ * changed base-58 library dependency. * changed rust-indy-sdk dependency to rust crate * bugfixes + ## 0.9.2 * Android and iOS builds in CD pipeline * Changed transactions to use JSON objects rather than unlabeled arrays diff --git a/devops/aws-codebuild/Jenkinsfile.ci b/devops/aws-codebuild/Jenkinsfile.ci index 291686f96..d508a30ba 100644 --- a/devops/aws-codebuild/Jenkinsfile.ci +++ b/devops/aws-codebuild/Jenkinsfile.ci @@ -54,13 +54,13 @@ pipelineWrapper({ // not accurate (it concatenates them): // debian package version: + // debian package name: - def sovtoken_deb_version = "0.9.25.98" - def sovtokenfees_deb_version = "0.9.25.98" + def sovtoken_deb_version = "0.9.3+12.58" + def sovtokenfees_deb_version = "0.9.3+13.58" sh """ cd ./devops/docker/ci/xenial/ - wget --no-check-certificate https://repo.corp.evernym.com/deb/pool/main/s/sovtoken/sovtoken_${sovtoken_deb_version}_amd64.deb - wget --no-check-certificate https://repo.corp.evernym.com/deb/pool/main/s/sovtokenfees/sovtokenfees_${sovtoken_deb_version}_amd64.deb + wget --no-check-certificatea https://repo.sovrin.org/deb/pool/xenial/rc/s/sovtoken/sovtoken_${sovtoken_deb_version}_amd64.deb + wget --no-check-certificate https://repo.sovrin.org/deb/pool/xenial/rc/s/sovtokenfees/sovtokenfees_${sovtoken_deb_version}_amd64.deb """ } } diff --git a/devops/docker/ci/xenial/Dockerfile b/devops/docker/ci/xenial/Dockerfile index 0833247ae..06f3f7f60 100644 --- a/devops/docker/ci/xenial/Dockerfile +++ b/devops/docker/ci/xenial/Dockerfile @@ -90,4 +90,4 @@ COPY libsovtoken-ci-entrypoint.sh /usr/local/bin/ RUN chmod +x /usr/local/bin/libsovtoken-ci-entrypoint.sh ENTRYPOINT ["libsovtoken-ci-entrypoint.sh"] -ENV LIBSOVTOKEN_CI_ENV_VERSION=0.43.0 +ENV LIBSOVTOKEN_CI_ENV_VERSION=0.44.0 From 7ef60c4fbe545534afa740a34cee67fe044f4df5 Mon Sep 17 00:00:00 2001 From: Cam Parra Date: Tue, 18 Sep 2018 08:22:05 -0600 Subject: [PATCH 34/36] extra a removed Signed-off-by: Cam Parra --- devops/aws-codebuild/Jenkinsfile.ci | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devops/aws-codebuild/Jenkinsfile.ci b/devops/aws-codebuild/Jenkinsfile.ci index d508a30ba..e3a8ee83c 100644 --- a/devops/aws-codebuild/Jenkinsfile.ci +++ b/devops/aws-codebuild/Jenkinsfile.ci @@ -59,7 +59,7 @@ pipelineWrapper({ sh """ cd ./devops/docker/ci/xenial/ - wget --no-check-certificatea https://repo.sovrin.org/deb/pool/xenial/rc/s/sovtoken/sovtoken_${sovtoken_deb_version}_amd64.deb + wget --no-check-certificate https://repo.sovrin.org/deb/pool/xenial/rc/s/sovtoken/sovtoken_${sovtoken_deb_version}_amd64.deb wget --no-check-certificate https://repo.sovrin.org/deb/pool/xenial/rc/s/sovtokenfees/sovtokenfees_${sovtoken_deb_version}_amd64.deb """ } From f1ef1e770ff72733f79dff25c3c87dcadfdeb053 Mon Sep 17 00:00:00 2001 From: Cam Parra Date: Tue, 18 Sep 2018 08:28:38 -0600 Subject: [PATCH 35/36] correct variable added Signed-off-by: Cam Parra --- devops/aws-codebuild/Jenkinsfile.ci | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devops/aws-codebuild/Jenkinsfile.ci b/devops/aws-codebuild/Jenkinsfile.ci index e3a8ee83c..fc816bb1f 100644 --- a/devops/aws-codebuild/Jenkinsfile.ci +++ b/devops/aws-codebuild/Jenkinsfile.ci @@ -60,7 +60,7 @@ pipelineWrapper({ sh """ cd ./devops/docker/ci/xenial/ wget --no-check-certificate https://repo.sovrin.org/deb/pool/xenial/rc/s/sovtoken/sovtoken_${sovtoken_deb_version}_amd64.deb - wget --no-check-certificate https://repo.sovrin.org/deb/pool/xenial/rc/s/sovtokenfees/sovtokenfees_${sovtoken_deb_version}_amd64.deb + wget --no-check-certificate https://repo.sovrin.org/deb/pool/xenial/rc/s/sovtokenfees/sovtokenfees_${sovtokenfees_deb_version}_amd64.deb """ } } From ed74172b96b5f36e9377a725ef0dba964b055d59 Mon Sep 17 00:00:00 2001 From: Cam Parra Date: Tue, 18 Sep 2018 08:34:46 -0600 Subject: [PATCH 36/36] incrementing ci version Signed-off-by: Cam Parra --- devops/docker/ci/xenial/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/devops/docker/ci/xenial/Dockerfile b/devops/docker/ci/xenial/Dockerfile index 06f3f7f60..7edbf4922 100644 --- a/devops/docker/ci/xenial/Dockerfile +++ b/devops/docker/ci/xenial/Dockerfile @@ -90,4 +90,4 @@ COPY libsovtoken-ci-entrypoint.sh /usr/local/bin/ RUN chmod +x /usr/local/bin/libsovtoken-ci-entrypoint.sh ENTRYPOINT ["libsovtoken-ci-entrypoint.sh"] -ENV LIBSOVTOKEN_CI_ENV_VERSION=0.44.0 +ENV LIBSOVTOKEN_CI_ENV_VERSION=0.45.0