From 0039f964af09ad9271b534f11f665e3807c4559e Mon Sep 17 00:00:00 2001 From: Ryan Marsh Date: Thu, 20 Sep 2018 23:44:38 -0600 Subject: [PATCH 1/7] upgrade libvcx to use libsovtoken 0.9.3 --- vcx/ci/libindy.dockerfile | 2 +- vcx/ci/scripts/androidBuild.sh | 4 ++-- vcx/libvcx/Cargo.toml | 2 +- vcx/libvcx/build_scripts/ios/mac/shared.functions.sh | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/vcx/ci/libindy.dockerfile b/vcx/ci/libindy.dockerfile index fc637350..8d935eee 100644 --- a/vcx/ci/libindy.dockerfile +++ b/vcx/ci/libindy.dockerfile @@ -55,7 +55,7 @@ RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 68DB5E88 && \ ARG LIBINDY_VER="1.6.6" ARG LIBNULL_VER="1.6.6" -ARG LIBSOVTOKEN_VER="0.9.2+1.90" +ARG LIBSOVTOKEN_VER="0.9.3+12.58" RUN apt-get update && apt-get install -y \ libsovtoken=${LIBSOVTOKEN_VER} \ diff --git a/vcx/ci/scripts/androidBuild.sh b/vcx/ci/scripts/androidBuild.sh index 31e3eca4..b6ae5b6d 100755 --- a/vcx/ci/scripts/androidBuild.sh +++ b/vcx/ci/scripts/androidBuild.sh @@ -8,7 +8,7 @@ setup() { export PATH=$PATH:/opt/gradle/gradle-3.4.1/bin export PATH=${PATH}:$ANDROID_HOME/platform-tools:$ANDROID_HOME/tools:$ANDROID_HOME/build-tools/25.0.2/ export PATH=${HOME}/.cargo/bin:${PATH} - export EVERNYM_REPO=https://repo.corp.evernym.com/filely/android + export SOVRIN_REPO=https://repo.sovrin.org/android/libsovtoken export VCX_BASE=../vcx # For docker # export VCX_BASE=${HOME}/vcx @@ -111,7 +111,7 @@ get_libsovtoken() { set -xv # Todo: This artifact was manually uploaded to this repo. Eventually, the file format will change. That is why it is hardcoded if [ -z ${LIBSOVTOKEN_DIR} ]; then - LIBSOVTOKEN_ZIP=libsovtoken_0.9.2-201809042315-b51bfba_all.zip + LIBSOVTOKEN_ZIP=libsovtoken_0.9.3-201809201729-7cf825d_all.zip if [ ! -d "libsovtoken" ]; then echo "retrieving libsovtoken prebuilt library" wget ${EVERNYM_REPO}/${LIBSOVTOKEN_ZIP} diff --git a/vcx/libvcx/Cargo.toml b/vcx/libvcx/Cargo.toml index 98bc0b22..04053890 100644 --- a/vcx/libvcx/Cargo.toml +++ b/vcx/libvcx/Cargo.toml @@ -64,7 +64,7 @@ tempfile = "2.2" [package.metadata.deb] maintainer = "Evernym, Inc." copyright = "2018, Evernym Inc." -depends = "$auto, libindy (=1.6.6), libsovtoken (=0.9.2+1.90)" +depends = "$auto, libindy (=1.6.6), libsovtoken (=0.9.3+12.58)" extended-description = """\ This is Evernym's SDK for managing Verifiable Credential eXchange against an Indy network. For specific instructions on building see the README in the corresponding github repo https://github.com/evernym/sdk""" section = "admin" diff --git a/vcx/libvcx/build_scripts/ios/mac/shared.functions.sh b/vcx/libvcx/build_scripts/ios/mac/shared.functions.sh index 67cf8bd3..3fdbdf45 100644 --- a/vcx/libvcx/build_scripts/ios/mac/shared.functions.sh +++ b/vcx/libvcx/build_scripts/ios/mac/shared.functions.sh @@ -1,6 +1,6 @@ #!/bin/sh -export LIBSOVTOKEN_IOS_BUILD_URL="https://repo.corp.evernym.com/filely/ios/libsovtoken_0.9.2-201809042322-b51bfba_all.zip" +export LIBSOVTOKEN_IOS_BUILD_URL="https://repo.sovrin.org/ios/libsovtoken/libsovtoken_0.9.3-201809201715-7cf825d_all.zip" export LIBINDY_IOS_BUILD_URL="https://repo.sovrin.org/ios/libindy/stable/libindy-core/1.6.6/libindy.tar.gz" # export LIBINDY_IOS_BUILD_URL="https://repo.sovrin.org/ios/libindy/rc/libindy-core/1.6.6-28/libindy.tar.gz" From c21455fac3de29f43dfbae385272a8e362dc22db Mon Sep 17 00:00:00 2001 From: ryMarsh44 Date: Thu, 4 Oct 2018 13:14:18 -0600 Subject: [PATCH 2/7] Updates old merge conflict --- vcx/ci/scripts/androidBuild.sh | 4 ---- 1 file changed, 4 deletions(-) diff --git a/vcx/ci/scripts/androidBuild.sh b/vcx/ci/scripts/androidBuild.sh index 2ec28b22..412b0d78 100755 --- a/vcx/ci/scripts/androidBuild.sh +++ b/vcx/ci/scripts/androidBuild.sh @@ -8,11 +8,7 @@ setup() { export PATH=$PATH:/opt/gradle/gradle-3.4.1/bin export PATH=${PATH}:$ANDROID_HOME/platform-tools:$ANDROID_HOME/tools:$ANDROID_HOME/build-tools/25.0.2/ export PATH=${HOME}/.cargo/bin:${PATH} -<<<<<<< HEAD - export SOVRIN_REPO=https://repo.sovrin.org/android/libsovtoken -======= export SOVRIN_REPO=https://repo.sovrin.org/android/libsovtoken/stable ->>>>>>> upstream/master export VCX_BASE=../vcx # For docker # export VCX_BASE=${HOME}/vcx From f8352f1cc2b56db0284c992dac13faa5e660b442 Mon Sep 17 00:00:00 2001 From: Ryan Marsh Date: Mon, 8 Oct 2018 11:42:08 -0600 Subject: [PATCH 3/7] builds against rc 1.6.7-30 --- vcx/ci/Jenkinsfile | 14 +++++++------- vcx/ci/libindy.dockerfile | 5 +++-- vcx/libvcx/Cargo.toml | 2 +- .../build_scripts/ios/mac/shared.functions.sh | 3 ++- 4 files changed, 13 insertions(+), 11 deletions(-) diff --git a/vcx/ci/Jenkinsfile b/vcx/ci/Jenkinsfile index a34c212d..485f870e 100644 --- a/vcx/ci/Jenkinsfile +++ b/vcx/ci/Jenkinsfile @@ -180,10 +180,10 @@ def android() { packageAndroid(android) } stage('Android Publishing') { - if (env.BRANCH_NAME == "master") { + // if (env.BRANCH_NAME == "master") { //Publish package on aptly publishAndroid(android) - } + // } } } catch (Exception ex) { currentBuild.result = "FAILED" @@ -211,14 +211,14 @@ def ios() { sh "source vcx/ci/scripts/iosBuild.sh" // Publish to Kraken - if (env.BRANCH_NAME == "master") { + // if (env.BRANCH_NAME == "master") { withCredentials([usernameColonPassword(credentialsId: 'jenkins-kraken-svc', variable: 'KRAKEN_CREDENTIALS')]) { sh "find /Users/jenkins/IOSBuilds/libvcxpartial/ -type f -name 'vcx.libvcxpartial_*_universal.zip' -exec curl -u \"${KRAKEN_CREDENTIALS}\" -X POST https://kraken.corp.evernym.com/repo/ios/upload -F 'file=@{}' \\;" sh "find /Users/jenkins/IOSBuilds/libvcxall/ -type f -name 'vcx.libvcxall_*_universal.zip' -exec curl -u \"${KRAKEN_CREDENTIALS}\" -X POST https://kraken.corp.evernym.com/repo/ios/upload -F 'file=@{}' \\;" // sh "vcx/ci/scripts/publish.sh 'vcx.libvcxpartial_*_universal.zip' https://kraken.corp.evernym.com/repo/ios/upload /Users/jenkins/IOSBuilds/libvcxpartial/" // sh "vcx/ci/scripts/publish.sh 'vcx.libvcxall_*_universal.zip' https://kraken.corp.evernym.com/repo/ios/upload /Users/jenkins/IOSBuilds/libvcxall/" } - } + // } } catch (Exception ex) { currentBuild.result = "FAILED" if (env.BRANCH_NAME == "master") { @@ -249,9 +249,9 @@ def buildAndroid(arch) { android.inside { ANDROID_SCRIPT_PATH = 'vcx/ci/scripts/androidBuild.sh' - LIBINDY_BRANCH="stable" - LIBINDY_VERSION="1.6.6" - LIBINDY_TAG="" + LIBINDY_BRANCH="rc" + LIBINDY_VERSION="1.6.7" + LIBINDY_TAG="30" sh 'sudo ./vcx/ci/scripts/installCert.sh' sh "LIBINDY_BRANCH=${LIBINDY_BRANCH} LIBINDY_VERSION=${LIBINDY_VERSION} LIBINDY_TAG=${LIBINDY_TAG} ./${ANDROID_SCRIPT_PATH} ${arch}" diff --git a/vcx/ci/libindy.dockerfile b/vcx/ci/libindy.dockerfile index 6c846297..b4b99e10 100644 --- a/vcx/ci/libindy.dockerfile +++ b/vcx/ci/libindy.dockerfile @@ -61,13 +61,14 @@ RUN /tmp/installCert.sh RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 68DB5E88 && \ add-apt-repository "deb https://repo.sovrin.org/sdk/deb xenial master" && \ add-apt-repository "deb https://repo.sovrin.org/sdk/deb xenial stable" && \ + add-apt-repository "deb https://repo.sovrin.org/sdk/deb xenial rc" && \ add-apt-repository 'deb https://repo.sovrin.org/deb xenial master' && \ add-apt-repository 'deb https://repo.sovrin.org/deb xenial stable' && \ add-apt-repository 'deb https://repo.corp.evernym.com/deb evernym-agency-dev-ubuntu main' && \ curl https://repo.corp.evernym.com/repo.corp.evenym.com-sig.key | apt-key add - -ARG LIBINDY_VER="1.6.6" -ARG LIBNULL_VER="1.6.6" +ARG LIBINDY_VER="1.6.7" +ARG LIBNULL_VER="1.6.7" ARG LIBSOVTOKEN_VER="0.9.3+5.4" RUN apt-get update && apt-get install -y \ diff --git a/vcx/libvcx/Cargo.toml b/vcx/libvcx/Cargo.toml index ad6de37d..1d33fc07 100644 --- a/vcx/libvcx/Cargo.toml +++ b/vcx/libvcx/Cargo.toml @@ -64,7 +64,7 @@ tempfile = "2.2" [package.metadata.deb] maintainer = "Evernym, Inc." copyright = "2018, Evernym Inc." -depends = "$auto, libindy (=1.6.6), libsovtoken (=0.9.3+5.4)" +depends = "$auto, libindy (=1.6.7), libsovtoken (=0.9.3+5.4)" extended-description = """\ This is Evernym's SDK for managing Verifiable Credential eXchange against an Indy network. For specific instructions on building see the README in the corresponding github repo https://github.com/evernym/sdk""" section = "admin" diff --git a/vcx/libvcx/build_scripts/ios/mac/shared.functions.sh b/vcx/libvcx/build_scripts/ios/mac/shared.functions.sh index 7dbbaac2..5d207f8c 100644 --- a/vcx/libvcx/build_scripts/ios/mac/shared.functions.sh +++ b/vcx/libvcx/build_scripts/ios/mac/shared.functions.sh @@ -1,7 +1,8 @@ #!/bin/sh export LIBSOVTOKEN_IOS_BUILD_URL="https://repo.sovrin.org/ios/libsovtoken/stable/libsovtoken_0.9.3-201809211716-2d02370_all.zip" -export LIBINDY_IOS_BUILD_URL="https://repo.sovrin.org/ios/libindy/stable/libindy-core/1.6.6/libindy.tar.gz" +# export LIBINDY_IOS_BUILD_URL="https://repo.sovrin.org/ios/libindy/stable/libindy-core/1.6.6/libindy.tar.gz" +export LIBINDY_IOS_BUILD_URL="https://repo.sovrin.org/ios/libindy/rc/libindy-core/1.6.7-30/libindy.tar.gz" # export LIBINDY_IOS_BUILD_URL="https://repo.sovrin.org/ios/libindy/rc/libindy-core/1.6.6-28/libindy.tar.gz" export LIBSOVTOKEN_FILE=$(basename ${LIBSOVTOKEN_IOS_BUILD_URL}) From 34b79e06ebd924f91e00ce9f798e132cfd87ce53 Mon Sep 17 00:00:00 2001 From: Ryan Marsh Date: Mon, 8 Oct 2018 13:54:25 -0600 Subject: [PATCH 4/7] removes armv7s from ios architectures --- vcx/ci/Jenkinsfile | 2 +- vcx/ci/libindy.dockerfile | 4 ++-- vcx/libvcx/build_scripts/ios/mac/mac.06.libvcx.build.sh | 3 ++- .../build_scripts/ios/mac/mac.12.combine.static.libs.sh | 3 ++- vcx/libvcx/build_scripts/ios/mac/mac.13.build.cocoapod.sh | 3 ++- 5 files changed, 9 insertions(+), 6 deletions(-) diff --git a/vcx/ci/Jenkinsfile b/vcx/ci/Jenkinsfile index 485f870e..88bffc6d 100644 --- a/vcx/ci/Jenkinsfile +++ b/vcx/ci/Jenkinsfile @@ -20,7 +20,7 @@ def testing() { stage('Testing') { parallel([ 'Xenial' : { mainUbuntu() }, - 'Android': { android() }, + // 'Android': { android() }, 'iOS' : { ios() } ]) } diff --git a/vcx/ci/libindy.dockerfile b/vcx/ci/libindy.dockerfile index b4b99e10..97c377e0 100644 --- a/vcx/ci/libindy.dockerfile +++ b/vcx/ci/libindy.dockerfile @@ -67,8 +67,8 @@ RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 68DB5E88 && \ add-apt-repository 'deb https://repo.corp.evernym.com/deb evernym-agency-dev-ubuntu main' && \ curl https://repo.corp.evernym.com/repo.corp.evenym.com-sig.key | apt-key add - -ARG LIBINDY_VER="1.6.7" -ARG LIBNULL_VER="1.6.7" +ARG LIBINDY_VER="1.6.7~30" +ARG LIBNULL_VER="1.6.7~30" ARG LIBSOVTOKEN_VER="0.9.3+5.4" RUN apt-get update && apt-get install -y \ diff --git a/vcx/libvcx/build_scripts/ios/mac/mac.06.libvcx.build.sh b/vcx/libvcx/build_scripts/ios/mac/mac.06.libvcx.build.sh index 2c7cd94c..44a7a9a5 100755 --- a/vcx/libvcx/build_scripts/ios/mac/mac.06.libvcx.build.sh +++ b/vcx/libvcx/build_scripts/ios/mac/mac.06.libvcx.build.sh @@ -24,7 +24,8 @@ if [ "$DEBUG_SYMBOLS" = "nodebug" ]; then sed -i .bak 's/debug = true/debug = false/' Cargo.toml fi -IOS_TARGETS="aarch64-apple-ios,armv7-apple-ios,armv7s-apple-ios,i386-apple-ios,x86_64-apple-ios" +IOS_TARGETS="aarch64-apple-ios,armv7-apple-ios,i386-apple-ios,x86_64-apple-ios" +# IOS_TARGETS="aarch64-apple-ios,armv7-apple-ios,armv7s-apple-ios,i386-apple-ios,x86_64-apple-ios" if [ ! -z "$2" ]; then IOS_TARGETS=$2 fi diff --git a/vcx/libvcx/build_scripts/ios/mac/mac.12.combine.static.libs.sh b/vcx/libvcx/build_scripts/ios/mac/mac.12.combine.static.libs.sh index 79cd0024..5888f839 100755 --- a/vcx/libvcx/build_scripts/ios/mac/mac.12.combine.static.libs.sh +++ b/vcx/libvcx/build_scripts/ios/mac/mac.12.combine.static.libs.sh @@ -48,7 +48,8 @@ if [ ! -z "$3" ]; then DEBUG_SYMBOLS=$3 fi -IOS_ARCHS="arm64,armv7,armv7s,i386,x86_64" +IOS_ARCHS="arm64,armv7,i386,x86_64" +# IOS_ARCHS="arm64,armv7,armv7s,i386,x86_64" if [ ! -z "$4" ]; then IOS_ARCHS=$4 fi diff --git a/vcx/libvcx/build_scripts/ios/mac/mac.13.build.cocoapod.sh b/vcx/libvcx/build_scripts/ios/mac/mac.13.build.cocoapod.sh index 0403393f..d6991277 100755 --- a/vcx/libvcx/build_scripts/ios/mac/mac.13.build.cocoapod.sh +++ b/vcx/libvcx/build_scripts/ios/mac/mac.13.build.cocoapod.sh @@ -15,7 +15,8 @@ COMBINED_LIB=$1 DATETIME=$(date +"%Y%m%d.%H%M") -IOS_ARCHS="arm64,armv7,armv7s,i386,x86_64" +IOS_ARCHS="arm64,armv7,i386,x86_64" +# IOS_ARCHS="arm64,armv7,armv7s,i386,x86_64" if [ ! -z "$2" ]; then IOS_ARCHS=$2 fi From 6e1d8133bac7f7c0942170f32bc5062368c5ebc8 Mon Sep 17 00:00:00 2001 From: Ryan Marsh Date: Mon, 8 Oct 2018 14:24:01 -0600 Subject: [PATCH 5/7] pinned agains libindy 1.6.7~39 --- vcx/ci/Jenkinsfile | 4 ++-- vcx/ci/libindy.dockerfile | 4 ++-- vcx/libvcx/Cargo.toml | 2 +- vcx/libvcx/build_scripts/ios/mac/mac.06.libvcx.build.sh | 3 +-- .../build_scripts/ios/mac/mac.12.combine.static.libs.sh | 3 +-- vcx/libvcx/build_scripts/ios/mac/mac.13.build.cocoapod.sh | 3 +-- vcx/libvcx/build_scripts/ios/mac/shared.functions.sh | 2 +- 7 files changed, 9 insertions(+), 12 deletions(-) diff --git a/vcx/ci/Jenkinsfile b/vcx/ci/Jenkinsfile index 88bffc6d..59158354 100644 --- a/vcx/ci/Jenkinsfile +++ b/vcx/ci/Jenkinsfile @@ -20,7 +20,7 @@ def testing() { stage('Testing') { parallel([ 'Xenial' : { mainUbuntu() }, - // 'Android': { android() }, + 'Android': { android() }, 'iOS' : { ios() } ]) } @@ -251,7 +251,7 @@ def buildAndroid(arch) { ANDROID_SCRIPT_PATH = 'vcx/ci/scripts/androidBuild.sh' LIBINDY_BRANCH="rc" LIBINDY_VERSION="1.6.7" - LIBINDY_TAG="30" + LIBINDY_TAG="39" sh 'sudo ./vcx/ci/scripts/installCert.sh' sh "LIBINDY_BRANCH=${LIBINDY_BRANCH} LIBINDY_VERSION=${LIBINDY_VERSION} LIBINDY_TAG=${LIBINDY_TAG} ./${ANDROID_SCRIPT_PATH} ${arch}" diff --git a/vcx/ci/libindy.dockerfile b/vcx/ci/libindy.dockerfile index 97c377e0..0be8cd72 100644 --- a/vcx/ci/libindy.dockerfile +++ b/vcx/ci/libindy.dockerfile @@ -67,8 +67,8 @@ RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 68DB5E88 && \ add-apt-repository 'deb https://repo.corp.evernym.com/deb evernym-agency-dev-ubuntu main' && \ curl https://repo.corp.evernym.com/repo.corp.evenym.com-sig.key | apt-key add - -ARG LIBINDY_VER="1.6.7~30" -ARG LIBNULL_VER="1.6.7~30" +ARG LIBINDY_VER="1.6.7~39" +ARG LIBNULL_VER="1.6.7~39" ARG LIBSOVTOKEN_VER="0.9.3+5.4" RUN apt-get update && apt-get install -y \ diff --git a/vcx/libvcx/Cargo.toml b/vcx/libvcx/Cargo.toml index 1d33fc07..c121656f 100644 --- a/vcx/libvcx/Cargo.toml +++ b/vcx/libvcx/Cargo.toml @@ -64,7 +64,7 @@ tempfile = "2.2" [package.metadata.deb] maintainer = "Evernym, Inc." copyright = "2018, Evernym Inc." -depends = "$auto, libindy (=1.6.7), libsovtoken (=0.9.3+5.4)" +depends = "$auto, libindy (=1.6.7~39), libsovtoken (=0.9.3+5.4)" extended-description = """\ This is Evernym's SDK for managing Verifiable Credential eXchange against an Indy network. For specific instructions on building see the README in the corresponding github repo https://github.com/evernym/sdk""" section = "admin" diff --git a/vcx/libvcx/build_scripts/ios/mac/mac.06.libvcx.build.sh b/vcx/libvcx/build_scripts/ios/mac/mac.06.libvcx.build.sh index 44a7a9a5..2c7cd94c 100755 --- a/vcx/libvcx/build_scripts/ios/mac/mac.06.libvcx.build.sh +++ b/vcx/libvcx/build_scripts/ios/mac/mac.06.libvcx.build.sh @@ -24,8 +24,7 @@ if [ "$DEBUG_SYMBOLS" = "nodebug" ]; then sed -i .bak 's/debug = true/debug = false/' Cargo.toml fi -IOS_TARGETS="aarch64-apple-ios,armv7-apple-ios,i386-apple-ios,x86_64-apple-ios" -# IOS_TARGETS="aarch64-apple-ios,armv7-apple-ios,armv7s-apple-ios,i386-apple-ios,x86_64-apple-ios" +IOS_TARGETS="aarch64-apple-ios,armv7-apple-ios,armv7s-apple-ios,i386-apple-ios,x86_64-apple-ios" if [ ! -z "$2" ]; then IOS_TARGETS=$2 fi diff --git a/vcx/libvcx/build_scripts/ios/mac/mac.12.combine.static.libs.sh b/vcx/libvcx/build_scripts/ios/mac/mac.12.combine.static.libs.sh index 5888f839..79cd0024 100755 --- a/vcx/libvcx/build_scripts/ios/mac/mac.12.combine.static.libs.sh +++ b/vcx/libvcx/build_scripts/ios/mac/mac.12.combine.static.libs.sh @@ -48,8 +48,7 @@ if [ ! -z "$3" ]; then DEBUG_SYMBOLS=$3 fi -IOS_ARCHS="arm64,armv7,i386,x86_64" -# IOS_ARCHS="arm64,armv7,armv7s,i386,x86_64" +IOS_ARCHS="arm64,armv7,armv7s,i386,x86_64" if [ ! -z "$4" ]; then IOS_ARCHS=$4 fi diff --git a/vcx/libvcx/build_scripts/ios/mac/mac.13.build.cocoapod.sh b/vcx/libvcx/build_scripts/ios/mac/mac.13.build.cocoapod.sh index d6991277..0403393f 100755 --- a/vcx/libvcx/build_scripts/ios/mac/mac.13.build.cocoapod.sh +++ b/vcx/libvcx/build_scripts/ios/mac/mac.13.build.cocoapod.sh @@ -15,8 +15,7 @@ COMBINED_LIB=$1 DATETIME=$(date +"%Y%m%d.%H%M") -IOS_ARCHS="arm64,armv7,i386,x86_64" -# IOS_ARCHS="arm64,armv7,armv7s,i386,x86_64" +IOS_ARCHS="arm64,armv7,armv7s,i386,x86_64" if [ ! -z "$2" ]; then IOS_ARCHS=$2 fi diff --git a/vcx/libvcx/build_scripts/ios/mac/shared.functions.sh b/vcx/libvcx/build_scripts/ios/mac/shared.functions.sh index 5d207f8c..2e94d04d 100644 --- a/vcx/libvcx/build_scripts/ios/mac/shared.functions.sh +++ b/vcx/libvcx/build_scripts/ios/mac/shared.functions.sh @@ -2,7 +2,7 @@ export LIBSOVTOKEN_IOS_BUILD_URL="https://repo.sovrin.org/ios/libsovtoken/stable/libsovtoken_0.9.3-201809211716-2d02370_all.zip" # export LIBINDY_IOS_BUILD_URL="https://repo.sovrin.org/ios/libindy/stable/libindy-core/1.6.6/libindy.tar.gz" -export LIBINDY_IOS_BUILD_URL="https://repo.sovrin.org/ios/libindy/rc/libindy-core/1.6.7-30/libindy.tar.gz" +export LIBINDY_IOS_BUILD_URL="https://repo.sovrin.org/ios/libindy/rc/libindy-core/1.6.7-39/libindy.tar.gz" # export LIBINDY_IOS_BUILD_URL="https://repo.sovrin.org/ios/libindy/rc/libindy-core/1.6.6-28/libindy.tar.gz" export LIBSOVTOKEN_FILE=$(basename ${LIBSOVTOKEN_IOS_BUILD_URL}) From ab7db98332e7d4e2110595f98689e2701cad7e3c Mon Sep 17 00:00:00 2001 From: Ryan Marsh Date: Wed, 10 Oct 2018 11:14:40 -0600 Subject: [PATCH 6/7] updates libindy to 1.6.7 and libsovtoken to rc 0.9.4+1.6 --- vcx/ci/Jenkinsfile | 4 ++-- vcx/ci/libindy.dockerfile | 7 +++---- vcx/ci/scripts/androidBuild.sh | 3 ++- vcx/libvcx/Cargo.toml | 2 +- vcx/libvcx/build_scripts/ios/mac/shared.functions.sh | 6 ++---- 5 files changed, 10 insertions(+), 12 deletions(-) diff --git a/vcx/ci/Jenkinsfile b/vcx/ci/Jenkinsfile index 59158354..e3397e83 100644 --- a/vcx/ci/Jenkinsfile +++ b/vcx/ci/Jenkinsfile @@ -249,9 +249,9 @@ def buildAndroid(arch) { android.inside { ANDROID_SCRIPT_PATH = 'vcx/ci/scripts/androidBuild.sh' - LIBINDY_BRANCH="rc" + LIBINDY_BRANCH="stable" LIBINDY_VERSION="1.6.7" - LIBINDY_TAG="39" + LIBINDY_TAG="" sh 'sudo ./vcx/ci/scripts/installCert.sh' sh "LIBINDY_BRANCH=${LIBINDY_BRANCH} LIBINDY_VERSION=${LIBINDY_VERSION} LIBINDY_TAG=${LIBINDY_TAG} ./${ANDROID_SCRIPT_PATH} ${arch}" diff --git a/vcx/ci/libindy.dockerfile b/vcx/ci/libindy.dockerfile index 0be8cd72..60b91a2d 100644 --- a/vcx/ci/libindy.dockerfile +++ b/vcx/ci/libindy.dockerfile @@ -61,15 +61,14 @@ RUN /tmp/installCert.sh RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 68DB5E88 && \ add-apt-repository "deb https://repo.sovrin.org/sdk/deb xenial master" && \ add-apt-repository "deb https://repo.sovrin.org/sdk/deb xenial stable" && \ - add-apt-repository "deb https://repo.sovrin.org/sdk/deb xenial rc" && \ add-apt-repository 'deb https://repo.sovrin.org/deb xenial master' && \ add-apt-repository 'deb https://repo.sovrin.org/deb xenial stable' && \ add-apt-repository 'deb https://repo.corp.evernym.com/deb evernym-agency-dev-ubuntu main' && \ curl https://repo.corp.evernym.com/repo.corp.evenym.com-sig.key | apt-key add - -ARG LIBINDY_VER="1.6.7~39" -ARG LIBNULL_VER="1.6.7~39" -ARG LIBSOVTOKEN_VER="0.9.3+5.4" +ARG LIBINDY_VER="1.6.7" +ARG LIBNULL_VER="1.6.7" +ARG LIBSOVTOKEN_VER="0.9.4+1.6" RUN apt-get update && apt-get install -y \ libsovtoken=${LIBSOVTOKEN_VER} \ diff --git a/vcx/ci/scripts/androidBuild.sh b/vcx/ci/scripts/androidBuild.sh index 412b0d78..98e3fd3d 100755 --- a/vcx/ci/scripts/androidBuild.sh +++ b/vcx/ci/scripts/androidBuild.sh @@ -114,7 +114,8 @@ get_libsovtoken() { LIBSOVTOKEN_ZIP=libsovtoken_0.9.3-201809211729-2d02370_all.zip if [ ! -d "libsovtoken" ]; then echo "retrieving libsovtoken prebuilt library" - wget ${SOVRIN_REPO}/${LIBSOVTOKEN_ZIP} + wget https://repo.corp.evernym.com/filely/android/libsovtoken_0.9.4-201810091643-94a47a5_all.zip + # wget ${SOVRIN_REPO}/${LIBSOVTOKEN_ZIP} unzip ${LIBSOVTOKEN_ZIP} fi export LIBSOVTOKEN_DIR="${PWD}/libsovtoken/${TRIPLET}" diff --git a/vcx/libvcx/Cargo.toml b/vcx/libvcx/Cargo.toml index c121656f..d52adebb 100644 --- a/vcx/libvcx/Cargo.toml +++ b/vcx/libvcx/Cargo.toml @@ -64,7 +64,7 @@ tempfile = "2.2" [package.metadata.deb] maintainer = "Evernym, Inc." copyright = "2018, Evernym Inc." -depends = "$auto, libindy (=1.6.7~39), libsovtoken (=0.9.3+5.4)" +depends = "$auto, libindy (=1.6.7), libsovtoken (=0.9.4+1.6)" extended-description = """\ This is Evernym's SDK for managing Verifiable Credential eXchange against an Indy network. For specific instructions on building see the README in the corresponding github repo https://github.com/evernym/sdk""" section = "admin" diff --git a/vcx/libvcx/build_scripts/ios/mac/shared.functions.sh b/vcx/libvcx/build_scripts/ios/mac/shared.functions.sh index 2e94d04d..67306470 100644 --- a/vcx/libvcx/build_scripts/ios/mac/shared.functions.sh +++ b/vcx/libvcx/build_scripts/ios/mac/shared.functions.sh @@ -1,9 +1,7 @@ #!/bin/sh -export LIBSOVTOKEN_IOS_BUILD_URL="https://repo.sovrin.org/ios/libsovtoken/stable/libsovtoken_0.9.3-201809211716-2d02370_all.zip" -# export LIBINDY_IOS_BUILD_URL="https://repo.sovrin.org/ios/libindy/stable/libindy-core/1.6.6/libindy.tar.gz" -export LIBINDY_IOS_BUILD_URL="https://repo.sovrin.org/ios/libindy/rc/libindy-core/1.6.7-39/libindy.tar.gz" -# export LIBINDY_IOS_BUILD_URL="https://repo.sovrin.org/ios/libindy/rc/libindy-core/1.6.6-28/libindy.tar.gz" +export LIBSOVTOKEN_IOS_BUILD_URL="https://repo.corp.evernym.com/filely/ios/libsovtoken_0.9.4-201810091632-94a47a5_all.zip" +export LIBINDY_IOS_BUILD_URL="https://repo.sovrin.org/ios/libindy/stable/libindy-core/1.6.7/libindy.tar.gz" export LIBSOVTOKEN_FILE=$(basename ${LIBSOVTOKEN_IOS_BUILD_URL}) export LIBSOVTOKEN_VERSION=$(echo ${LIBSOVTOKEN_FILE} | cut -d'_' -f 2) From 8c7698647e3b836af6f4f52e767faedab96511eb Mon Sep 17 00:00:00 2001 From: Ryan Marsh Date: Wed, 10 Oct 2018 11:23:34 -0600 Subject: [PATCH 7/7] updated libsovtoken version for android --- vcx/ci/scripts/androidBuild.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vcx/ci/scripts/androidBuild.sh b/vcx/ci/scripts/androidBuild.sh index 98e3fd3d..710bc006 100755 --- a/vcx/ci/scripts/androidBuild.sh +++ b/vcx/ci/scripts/androidBuild.sh @@ -111,7 +111,7 @@ get_libsovtoken() { set -xv # Todo: This artifact was manually uploaded to this repo. Eventually, the file format will change. That is why it is hardcoded if [ -z ${LIBSOVTOKEN_DIR} ]; then - LIBSOVTOKEN_ZIP=libsovtoken_0.9.3-201809211729-2d02370_all.zip + LIBSOVTOKEN_ZIP=libsovtoken_0.9.4-201810091643-94a47a5_all.zip if [ ! -d "libsovtoken" ]; then echo "retrieving libsovtoken prebuilt library" wget https://repo.corp.evernym.com/filely/android/libsovtoken_0.9.4-201810091643-94a47a5_all.zip