Skip to content

Commit 7775022

Browse files
Patrik-Stasmirgee
Patrik-Stas
and
mirgee
authored
Use libindy with rusql fix for ios build (#306)
* Use libindy with rusql fix for ios build Signed-off-by: Patrik Stas <patrik.stas@absa.africa> * Try to build indy from 1.16.0release by commit hash for ios build Signed-off-by: Patrik Stas <patrik.stas@absa.africa> * Try rusql fix with correct indy/indy-sys dependencies Signed-off-by: Patrik Stas <patrik.stas@absa.africa> * Binary search, try ios build with indy 32e30b6ca Signed-off-by: Patrik Stas <patrik.stas@absa.africa> * Add list of indy commits on masteer Signed-off-by: Patrik Stas <patrik.stas@absa.africa> * Try using vendored feature Signed-off-by: Miroslav Kovar <miroslavkovar@protonmail.com> * Try using vendored for ios only Signed-off-by: Miroslav Kovar <miroslavkovar@protonmail.com> * Use vendored openssl with rusql fix libindy version Signed-off-by: Patrik Stas <patrik.stas@absa.africa> * Try using OPENSSL_NO_VENDOR Signed-off-by: Miroslav Kovar <miroslavkovar@protonmail.com> * Use vendored for all archs except musl via environment variables Signed-off-by: Miroslav Kovar <miroslavkovar@protonmail.com> * Remove comments Signed-off-by: Miroslav Kovar <miroslavkovar@protonmail.com> Co-authored-by: Miroslav Kovar <miroslavkovar@protonmail.com>
1 parent 2714cef commit 7775022

File tree

9 files changed

+31
-21
lines changed

9 files changed

+31
-21
lines changed

‎.github/workflows/main.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -453,7 +453,7 @@ jobs:
453453
run: |
454454
set -x
455455
sudo rm -rf "/usr/local/share/boost" "$AGENT_TOOLSDIRECTORY" "/usr/local/lib/android" "/usr/share/dotnet"
456-
docker run --rm -i --name libvcx --network host $DOCKER_IMG_NAME_LIBVCX \
456+
docker run --rm -i --name libvcx --network host -e X86_64_ALPINE_LINUX_MUSL_OPENSSL_NO_VENDOR=true $DOCKER_IMG_NAME_LIBVCX \
457457
bash -c '(cd $HOME/libvcx && \
458458
RUST_TEST_THREADS=1 cargo test --release --features "general_test" && \
459459
cd $HOME/agency_client && \
@@ -514,7 +514,7 @@ jobs:
514514
- name: Run pool integration tests
515515
run: |
516516
set -x
517-
docker run --rm -i --name libvcx --network host $DOCKER_IMG_NAME_LIBVCX \
517+
docker run --rm -i --name libvcx --network host -e X86_64_ALPINE_LINUX_MUSL_OPENSSL_NO_VENDOR=true $DOCKER_IMG_NAME_LIBVCX \
518518
bash -c '(cd $HOME/libvcx && \
519519
RUST_TEST_THREADS=1 TEST_POOL_IP=127.0.0.1 cargo test --release --features "pool_tests agency_v2")'
520520
@@ -573,7 +573,7 @@ jobs:
573573
- name: Run agency+pool integration tests
574574
run: |
575575
set -x
576-
docker run --rm -i --name libvcx --network host $DOCKER_IMG_NAME_LIBVCX \
576+
docker run --rm -i --name libvcx --network host -e X86_64_ALPINE_LINUX_MUSL_OPENSSL_NO_VENDOR=true $DOCKER_IMG_NAME_LIBVCX \
577577
bash -c '(cd $HOME/libvcx && \
578578
cargo --version && \
579579
rustc --version && \

‎Cargo.lock

Lines changed: 14 additions & 4 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎agency_client/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ reqwest = "0.9.5"
2020
regex = "1.1.0"
2121
rmp-serde = "0.13.7"
2222
rust-base58 = "0.0.4"
23-
indy = "1.16.0"
23+
indy = "1.16.0-post-59"
2424
futures = "0.1.23"
2525
url = "1.5.1"
2626
failure = "0.1.6"
@@ -30,7 +30,7 @@ rand = "0.3"
3030
android_logger = "0.5"
3131

3232
[package.metadata.deb]
33-
depends = "libindy (= 1.16.0)"
33+
depends = "libindy (= 1.16.0-post-59)"
3434
extended-description = """\
3535
This is the official SDK for Hyperledger Indy, which provides a\
3636
distributed-ledger-based foundation for self-sovereign identity.\

‎ci/alpine_core.dockerfile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,9 @@ FROM alpine:3.12 AS builder
33
ARG UID=1000
44
ARG GID=1000
55

6-
76
ARG INDYSDK_PATH=/home/indy/indy-sdk
87
ARG INDYSDK_REPO=https://github.com/hyperledger/indy-sdk.git
9-
ARG INDYSDK_REVISION=v1.16.0
8+
ARG INDYSDK_REVISION=efb7215
109

1110
ENV RUST_LOG=warning
1211

@@ -22,7 +21,7 @@ RUN apk update && apk upgrade && \
2221
openssl-dev \
2322
zeromq-dev
2423

25-
ARG RUST_VER="1.45.2"
24+
ARG RUST_VER="1.53.0"
2625
RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain $RUST_VER
2726

2827
USER indy

‎ci/libvcx.dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ WORKDIR /home/indy
66
COPY --chown=indy ./ ./
77

88
USER indy
9+
ENV X86_64_ALPINE_LINUX_MUSL_OPENSSL_NO_VENDOR "true"
910
RUN cargo build --release --manifest-path=/home/indy/Cargo.toml
1011

1112
USER root
@@ -44,7 +45,7 @@ RUN apk add --no-cache \
4445
python2 \
4546
zeromq-dev
4647

47-
ARG RUST_VER="1.45.2"
48+
ARG RUST_VER="1.53.0"
4849
RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain $RUST_VER
4950

5051

‎ci/ubuntu.dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ ARG uid=1000
6060
RUN useradd -ms /bin/bash -u $uid vcx
6161
USER vcx
6262

63-
ARG RUST_VER="1.45.2"
63+
ARG RUST_VER="1.53.0"
6464
RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain $RUST_VER
6565
ENV PATH /home/vcx/.cargo/bin:$PATH
6666

‎libvcx/Cargo.toml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,10 +45,10 @@ regex = "1.1.0"
4545
rust-base58 = "0.0.4"
4646
rmp-serde = "0.13.7"
4747
base64 = "0.8.0"
48-
openssl = { version = "0.10.29" }
48+
openssl = { version = "0.10.35", features = ["vendored"] }
4949
num-traits = "0.2.0"
50-
indy = "1.16.0"
51-
indy-sys = "1.16.0"
50+
indy = "1.16.0-post-59"
51+
indy-sys = "1.16.0-post-59"
5252
futures = "0.3.15"
5353
tokio = { version = "1.7.1", features = ["rt-multi-thread"] }
5454
libloading = "0.5.0"
@@ -69,7 +69,7 @@ serde_json = "1.0"
6969
serde_derive = "1.0"
7070

7171
[package.metadata.deb]
72-
depends = "libindy (= 1.16.0)"
72+
depends = "libindy (= 1.16.0-post-59)"
7373
extended-description = """\
7474
This is the official SDK for Hyperledger Indy, which provides a\
7575
distributed-ledger-based foundation for self-sovereign identity.\

‎wrappers/ios/ci/build.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@ for i in $(ls -t $OPENSSL_PATH); do
1515
break
1616
done
1717

18-
INDY_VERSION="v1.16.0"
18+
INDY_VERSION="efb7215" # indy-1.16.0-post-59 - "v1.16.0" + rusql update fix + (number of other commits on master branch)
1919
REPO_DIR=$PWD
2020
SCRIPT_DIR="$( cd "$(dirname "$0")" ; pwd -P )"
2121
OUTPUT_DIR=/tmp/artifacts
2222
INDY_SDK_DIR=$OUTPUT_DIR/indy-sdk
2323

2424
setup() {
2525
echo "Setup rustup"
26-
rustup default 1.45.2
26+
rustup default 1.53.0
2727
rustup component add rls-preview rust-analysis rust-src
2828

2929
echo "Setup rustup target platforms"

‎wrappers/java/ci/android.dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ RUN apt-get install -y nodejs
5151
USER indy
5252

5353
# Install Rust toolchain
54-
ARG RUST_VER=1.45.2
54+
ARG RUST_VER=1.53.0
5555
RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain ${RUST_VER}
5656
ENV PATH /home/indy/.cargo/bin:$PATH
5757

0 commit comments

Comments
 (0)