Skip to content
This repository was archived by the owner on Jul 31, 2019. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions vcx/ci/Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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") {
Expand Down Expand Up @@ -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'
Expand Down
6 changes: 3 additions & 3 deletions vcx/ci/libindy.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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} \
Expand Down
5 changes: 3 additions & 2 deletions vcx/ci/scripts/androidBuild.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down
2 changes: 1 addition & 1 deletion vcx/libvcx/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
5 changes: 2 additions & 3 deletions vcx/libvcx/build_scripts/ios/mac/shared.functions.sh
Original file line number Diff line number Diff line change
@@ -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)
Expand Down