diff --git a/vcx/ci/Jenkinsfile b/vcx/ci/Jenkinsfile index a34c212d..e3397e83 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") { @@ -250,7 +250,7 @@ def buildAndroid(arch) { android.inside { ANDROID_SCRIPT_PATH = 'vcx/ci/scripts/androidBuild.sh' LIBINDY_BRANCH="stable" - LIBINDY_VERSION="1.6.6" + LIBINDY_VERSION="1.6.7" LIBINDY_TAG="" sh 'sudo ./vcx/ci/scripts/installCert.sh' diff --git a/vcx/ci/libindy.dockerfile b/vcx/ci/libindy.dockerfile index 6c846297..60b91a2d 100644 --- a/vcx/ci/libindy.dockerfile +++ b/vcx/ci/libindy.dockerfile @@ -66,9 +66,9 @@ 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.6" -ARG LIBNULL_VER="1.6.6" -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..710bc006 100755 --- a/vcx/ci/scripts/androidBuild.sh +++ b/vcx/ci/scripts/androidBuild.sh @@ -111,10 +111,11 @@ 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 ${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 ad6de37d..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.6), 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 7dbbaac2..67306470 100644 --- a/vcx/libvcx/build_scripts/ios/mac/shared.functions.sh +++ b/vcx/libvcx/build_scripts/ios/mac/shared.functions.sh @@ -1,8 +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.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)