diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index fea6f12c84..cefd11ed2c 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -453,7 +453,7 @@ jobs: run: | set -x sudo rm -rf "/usr/local/share/boost" "$AGENT_TOOLSDIRECTORY" "/usr/local/lib/android" "/usr/share/dotnet" - docker run --rm -i --name libvcx --network host $DOCKER_IMG_NAME_LIBVCX \ + docker run --rm -i --name libvcx --network host -e X86_64_ALPINE_LINUX_MUSL_OPENSSL_NO_VENDOR=true $DOCKER_IMG_NAME_LIBVCX \ bash -c '(cd $HOME/libvcx && \ RUST_TEST_THREADS=1 cargo test --release --features "general_test" && \ cd $HOME/agency_client && \ @@ -514,7 +514,7 @@ jobs: - name: Run pool integration tests run: | set -x - docker run --rm -i --name libvcx --network host $DOCKER_IMG_NAME_LIBVCX \ + docker run --rm -i --name libvcx --network host -e X86_64_ALPINE_LINUX_MUSL_OPENSSL_NO_VENDOR=true $DOCKER_IMG_NAME_LIBVCX \ bash -c '(cd $HOME/libvcx && \ RUST_TEST_THREADS=1 TEST_POOL_IP=127.0.0.1 cargo test --release --features "pool_tests agency_v2")' @@ -573,7 +573,7 @@ jobs: - name: Run agency+pool integration tests run: | set -x - docker run --rm -i --name libvcx --network host $DOCKER_IMG_NAME_LIBVCX \ + docker run --rm -i --name libvcx --network host -e X86_64_ALPINE_LINUX_MUSL_OPENSSL_NO_VENDOR=true $DOCKER_IMG_NAME_LIBVCX \ bash -c '(cd $HOME/libvcx && \ cargo --version && \ rustc --version && \ diff --git a/Cargo.lock b/Cargo.lock index dc3119c700..5525f50249 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1060,9 +1060,9 @@ checksum = "af8b08b04175473088b46763e51ee54da5f9a164bc162f615b91bc179dbf15a3" [[package]] name = "openssl" -version = "0.10.34" +version = "0.10.35" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d7830286ad6a3973c0f1d9b73738f69c76b739301d0229c4b96501695cbe4c8" +checksum = "549430950c79ae24e6d02e0b7404534ecf311d94cc9f861e9e4020187d13d885" dependencies = [ "bitflags", "cfg-if 1.0.0", @@ -1078,15 +1078,25 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "28988d872ab76095a6e6ac88d99b54fd267702734fd7ffe610ca27f533ddb95a" +[[package]] +name = "openssl-src" +version = "111.15.0+1.1.1k" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b1a5f6ae2ac04393b217ea9f700cd04fa9bf3d93fae2872069f3d15d908af70a" +dependencies = [ + "cc", +] + [[package]] name = "openssl-sys" -version = "0.9.63" +version = "0.9.65" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6b0d6fb7d80f877617dfcb014e605e2b5ab2fb0afdf27935219bb6bd984cb98" +checksum = "7a7907e3bfa08bb85105209cdfcb6c63d109f8f6c1ed6ca318fff5c1853fbc1d" dependencies = [ "autocfg 1.0.1", "cc", "libc", + "openssl-src", "pkg-config", "vcpkg", ] diff --git a/agency_client/Cargo.toml b/agency_client/Cargo.toml index 740579810c..c1f8d59c74 100644 --- a/agency_client/Cargo.toml +++ b/agency_client/Cargo.toml @@ -20,7 +20,7 @@ reqwest = "0.9.5" regex = "1.1.0" rmp-serde = "0.13.7" rust-base58 = "0.0.4" -indy = "1.16.0" +indy = "1.16.0-post-59" futures = "0.1.23" url = "1.5.1" failure = "0.1.6" @@ -30,7 +30,7 @@ rand = "0.3" android_logger = "0.5" [package.metadata.deb] -depends = "libindy (= 1.16.0)" +depends = "libindy (= 1.16.0-post-59)" extended-description = """\ This is the official SDK for Hyperledger Indy, which provides a\ distributed-ledger-based foundation for self-sovereign identity.\ diff --git a/ci/alpine_core.dockerfile b/ci/alpine_core.dockerfile index b3a3a3adaf..169fabdd55 100644 --- a/ci/alpine_core.dockerfile +++ b/ci/alpine_core.dockerfile @@ -3,10 +3,9 @@ FROM alpine:3.12 AS builder ARG UID=1000 ARG GID=1000 - ARG INDYSDK_PATH=/home/indy/indy-sdk ARG INDYSDK_REPO=https://github.com/hyperledger/indy-sdk.git -ARG INDYSDK_REVISION=v1.16.0 +ARG INDYSDK_REVISION=efb7215 ENV RUST_LOG=warning @@ -22,7 +21,7 @@ RUN apk update && apk upgrade && \ openssl-dev \ zeromq-dev -ARG RUST_VER="1.45.2" +ARG RUST_VER="1.53.0" RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain $RUST_VER USER indy diff --git a/ci/libvcx.dockerfile b/ci/libvcx.dockerfile index b6c8e12985..ecdbe4f8c7 100644 --- a/ci/libvcx.dockerfile +++ b/ci/libvcx.dockerfile @@ -6,6 +6,7 @@ WORKDIR /home/indy COPY --chown=indy ./ ./ USER indy +ENV X86_64_ALPINE_LINUX_MUSL_OPENSSL_NO_VENDOR "true" RUN cargo build --release --manifest-path=/home/indy/Cargo.toml USER root @@ -44,7 +45,7 @@ RUN apk add --no-cache \ python2 \ zeromq-dev -ARG RUST_VER="1.45.2" +ARG RUST_VER="1.53.0" RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain $RUST_VER diff --git a/ci/ubuntu.dockerfile b/ci/ubuntu.dockerfile index 818525db99..1eb7fbb970 100644 --- a/ci/ubuntu.dockerfile +++ b/ci/ubuntu.dockerfile @@ -60,7 +60,7 @@ ARG uid=1000 RUN useradd -ms /bin/bash -u $uid vcx USER vcx -ARG RUST_VER="1.45.2" +ARG RUST_VER="1.53.0" RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain $RUST_VER ENV PATH /home/vcx/.cargo/bin:$PATH diff --git a/libvcx/Cargo.toml b/libvcx/Cargo.toml index bf7770dbd6..5d12070f57 100644 --- a/libvcx/Cargo.toml +++ b/libvcx/Cargo.toml @@ -45,10 +45,10 @@ regex = "1.1.0" rust-base58 = "0.0.4" rmp-serde = "0.13.7" base64 = "0.8.0" -openssl = { version = "0.10.29" } +openssl = { version = "0.10.35", features = ["vendored"] } num-traits = "0.2.0" -indy = "1.16.0" -indy-sys = "1.16.0" +indy = "1.16.0-post-59" +indy-sys = "1.16.0-post-59" futures = "0.3.15" tokio = { version = "1.7.1", features = ["rt-multi-thread"] } libloading = "0.5.0" @@ -69,7 +69,7 @@ serde_json = "1.0" serde_derive = "1.0" [package.metadata.deb] -depends = "libindy (= 1.16.0)" +depends = "libindy (= 1.16.0-post-59)" extended-description = """\ This is the official SDK for Hyperledger Indy, which provides a\ distributed-ledger-based foundation for self-sovereign identity.\ diff --git a/wrappers/ios/ci/build.sh b/wrappers/ios/ci/build.sh index 5da28e2aa5..3df3a45f86 100755 --- a/wrappers/ios/ci/build.sh +++ b/wrappers/ios/ci/build.sh @@ -15,7 +15,7 @@ for i in $(ls -t $OPENSSL_PATH); do break done -INDY_VERSION="v1.16.0" +INDY_VERSION="efb7215" # indy-1.16.0-post-59 - "v1.16.0" + rusql update fix + (number of other commits on master branch) REPO_DIR=$PWD SCRIPT_DIR="$( cd "$(dirname "$0")" ; pwd -P )" OUTPUT_DIR=/tmp/artifacts @@ -23,7 +23,7 @@ INDY_SDK_DIR=$OUTPUT_DIR/indy-sdk setup() { echo "Setup rustup" - rustup default 1.45.2 + rustup default 1.53.0 rustup component add rls-preview rust-analysis rust-src echo "Setup rustup target platforms" diff --git a/wrappers/java/ci/android.dockerfile b/wrappers/java/ci/android.dockerfile index e83f59a5d1..df79c689e9 100644 --- a/wrappers/java/ci/android.dockerfile +++ b/wrappers/java/ci/android.dockerfile @@ -51,7 +51,7 @@ RUN apt-get install -y nodejs USER indy # Install Rust toolchain -ARG RUST_VER=1.45.2 +ARG RUST_VER=1.53.0 RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --default-toolchain ${RUST_VER} ENV PATH /home/indy/.cargo/bin:$PATH