Skip to content
This repository has been archived by the owner on Jul 31, 2019. It is now read-only.

Do NOT merge, just for fixing the build temporarily... #557

Open
wants to merge 22 commits into
base: master
Choose a base branch
from
Open

Do NOT merge, just for fixing the build temporarily... #557

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
0dea9a6
Copied over libvcx/src and libvcx/tests from indy-sdk to evernym/sdk.
Jan 18, 2019
d556c69
Temporarily enabling only Android and publishing each time for the PR.
Jan 18, 2019
df046fd
Copied the include folder over from indy-sdk to evernym/sdk.
Jan 18, 2019
3f791e3
Copied over the scripts folder from libvcx in indy-sdk to evernym/sdk.
Jan 18, 2019
f285120
Temporarily only build x86 architecture so that the build is faster a…
Jan 18, 2019
4fbcf30
Removed all of the other architectures other than x86.
Jan 18, 2019
16052c8
Copied over the libvcx/sample_config folder from indy-sdk to evernym/sdk
Jan 18, 2019
240f464
Fixed the packaging to only do x86
Jan 18, 2019
0c233d0
Copied the libvcx/Cargo.toml from indy-sdk over to evernym/sdk and co…
Jan 18, 2019
39514be
Fixed each of the wgets to be quiet so that the logs are smaller.
Jan 18, 2019
a3e7f77
Switching over to libindy 1.7.0
Jan 18, 2019
37c618f
Copied over the Cargo.lock file from libvcx/Cargo.lock in indy-sdk to…
Jan 18, 2019
ddd8946
Setting the script to fail when a build error occurs.
Jan 18, 2019
57dde06
Copied build.rs from indy-sdk to evernym/sdk and removed the Cargo.lo…
Jan 18, 2019
6415149
Changing the rustc compiler to 1.31.1
Jan 18, 2019
36263b9
Fixed the build.rs missing curly brace
Jan 18, 2019
d5333ee
Added the fix for logger.rs that Ryan added to PR-22
Jan 19, 2019
26c500d
Switching back to libindy 1.6.8 and rustc 1.27.0 just to see if it bu…
Jan 19, 2019
b9a5c97
Switching back to libindy 1.7.0
Jan 19, 2019
5a94487
Switched to libindy 1.6.8 and rustc 1.31.1
Jan 19, 2019
52d960f
Switching the version of libindy to 1.7.0-934.
Jan 19, 2019
772ee32
Turning back on all of the build artifacts to make sure that iOS also…
Jan 19, 2019
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
9 changes: 5 additions & 4 deletions vcx/ci/Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,9 +249,9 @@ def buildAndroid(arch) {

android.inside {
ANDROID_SCRIPT_PATH = 'vcx/ci/scripts/androidBuild.sh'
LIBINDY_BRANCH="stable"
LIBINDY_VERSION="1.6.8"
LIBINDY_TAG=""
LIBINDY_BRANCH="master"
LIBINDY_VERSION="1.7.0"
LIBINDY_TAG="934"

sh 'sudo ./vcx/ci/scripts/installCert.sh'
sh "LIBINDY_BRANCH=${LIBINDY_BRANCH} LIBINDY_VERSION=${LIBINDY_VERSION} LIBINDY_TAG=${LIBINDY_TAG} ./${ANDROID_SCRIPT_PATH} ${arch}"
Expand All @@ -275,7 +275,8 @@ def buildAndroid(arch) {
}

def packageAndroid(android) {
all_archs = ["arm", "arm64", "armv7", "x86", "x86_64"]
//all_archs = ["arm", "arm64", "armv7", "x86", "x86_64"]
all_archs = ["x86"]
for (arch in all_archs) {
dir("runtime_android_build/libvcx_${arch}") {
unstash name: "libvcx_${arch}"
Expand Down
12 changes: 6 additions & 6 deletions vcx/ci/libindy.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ RUN apt-get update -y && apt-get install -y \
curl \
libffi-dev \
ruby \
ruby-dev \
ruby-dev \
sudo \
rubygems \
libzmq5 \
Expand All @@ -36,17 +36,17 @@ RUN apt-get update -y && apt-get install -y \
unzip \
vim

# Install Nodejs
# Install Nodejs
RUN curl -sL https://deb.nodesource.com/setup_8.x | bash - \
&& apt-get install -y nodejs

# Install Rust
ARG RUST_VER="1.27.0"
ARG RUST_VER="1.31.1"
ENV RUST_ARCHIVE=rust-${RUST_VER}-x86_64-unknown-linux-gnu.tar.gz
ENV RUST_DOWNLOAD_URL=https://static.rust-lang.org/dist/$RUST_ARCHIVE

# Install Gradle
RUN wget https://services.gradle.org/distributions/gradle-3.4.1-bin.zip
RUN wget -q https://services.gradle.org/distributions/gradle-3.4.1-bin.zip
RUN mkdir /opt/gradle
RUN unzip -d /opt/gradle gradle-3.4.1-bin.zip

Expand All @@ -66,8 +66,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.8"
ARG LIBNULL_VER="1.6.8"
ARG LIBINDY_VER="1.7.0"
ARG LIBNULL_VER="1.7.0"
ARG LIBSOVTOKEN_VER="0.9.6"

RUN apt-get update && apt-get install -y \
Expand Down
2 changes: 1 addition & 1 deletion vcx/ci/libvcx.dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ ARG uid=1000
RUN useradd -ms /bin/bash -u $uid vcx
USER vcx

RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain 1.27.0
RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain 1.31.1
ENV PATH /home/vcx/.cargo/bin:$PATH
WORKDIR /home/vcx
ENV PATH /home/vcx:$PATH
Expand Down
8 changes: 5 additions & 3 deletions vcx/ci/scripts/androidBuild.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#!/bin/bash

set -e

setup() {
echo "Working Directory: ${PWD}"
set -e
Expand Down Expand Up @@ -94,9 +96,9 @@ get_libindy() {

if [ ! -d "libindy_${ARCH}" ]; then
if [ "$LIBINDY_BRANCH" = "stable" ]; then
wget https://repo.sovrin.org/android/libindy/${LIBINDY_BRANCH}/${LIBINDY_VERSION}/libindy_android_${ARCH}_${LIBINDY_VERSION}.zip
wget -q https://repo.sovrin.org/android/libindy/${LIBINDY_BRANCH}/${LIBINDY_VERSION}/libindy_android_${ARCH}_${LIBINDY_VERSION}.zip
else
wget https://repo.sovrin.org/android/libindy/${LIBINDY_BRANCH}/${LIBINDY_VERSION}-${LIBINDY_TAG}/libindy_android_${ARCH}_${LIBINDY_VERSION}.zip
wget -q https://repo.sovrin.org/android/libindy/${LIBINDY_BRANCH}/${LIBINDY_VERSION}-${LIBINDY_TAG}/libindy_android_${ARCH}_${LIBINDY_VERSION}.zip
fi

unzip libindy_android_${ARCH}_${LIBINDY_VERSION}.zip
Expand All @@ -114,7 +116,7 @@ get_libsovtoken() {
LIBSOVTOKEN_ZIP=libsovtoken_0.9.6-201811211720-4901e95_all.zip
if [ ! -d "libsovtoken" ]; then
echo "retrieving libsovtoken prebuilt library"
wget ${SOVRIN_REPO}/${LIBSOVTOKEN_ZIP}
wget -q ${SOVRIN_REPO}/${LIBSOVTOKEN_ZIP}
unzip ${LIBSOVTOKEN_ZIP}
fi
export LIBSOVTOKEN_DIR="${PWD}/libsovtoken/${TRIPLET}"
Expand Down
Loading