From c33824ae4d4c90427ec2d6937c34858bd6d1b307 Mon Sep 17 00:00:00 2001 From: Patrik Stas Date: Wed, 23 Jun 2021 14:06:14 +0200 Subject: [PATCH 01/11] Use libindy with rusql fix for ios build Signed-off-by: Patrik Stas --- wrappers/ios/ci/build.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wrappers/ios/ci/build.sh b/wrappers/ios/ci/build.sh index 5da28e2aa5..3394497611 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" # this is "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 From 610f151d83d04a26133ec5e577966a9c92be918b Mon Sep 17 00:00:00 2001 From: Patrik Stas Date: Wed, 23 Jun 2021 17:35:32 +0200 Subject: [PATCH 02/11] Try to build indy from 1.16.0release by commit hash for ios build Signed-off-by: Patrik Stas --- wrappers/ios/ci/build.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/wrappers/ios/ci/build.sh b/wrappers/ios/ci/build.sh index 3394497611..1ad26c1619 100755 --- a/wrappers/ios/ci/build.sh +++ b/wrappers/ios/ci/build.sh @@ -15,7 +15,8 @@ for i in $(ls -t $OPENSSL_PATH); do break done -INDY_VERSION="efb7215" # this is "v1.16.0" + rusql update fix + (number of other commits on master branch) +#INDY_VERSION="efb7215" # this is "v1.16.0" + rusql update fix + (number of other commits on master branch) +INDY_VERSION="b4b330ef3" # this is "v1.16.0" tag REPO_DIR=$PWD SCRIPT_DIR="$( cd "$(dirname "$0")" ; pwd -P )" OUTPUT_DIR=/tmp/artifacts From e932b6da7fb1141399ae1f89037877e9a41380f8 Mon Sep 17 00:00:00 2001 From: Patrik Stas Date: Thu, 24 Jun 2021 08:55:47 +0200 Subject: [PATCH 03/11] Try rusql fix with correct indy/indy-sys dependencies Signed-off-by: Patrik Stas --- agency_client/Cargo.toml | 4 ++-- libvcx/Cargo.toml | 6 +++--- wrappers/ios/ci/build.sh | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) 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/libvcx/Cargo.toml b/libvcx/Cargo.toml index bf7770dbd6..33118a7da3 100644 --- a/libvcx/Cargo.toml +++ b/libvcx/Cargo.toml @@ -47,8 +47,8 @@ rmp-serde = "0.13.7" base64 = "0.8.0" openssl = { version = "0.10.29" } 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 1ad26c1619..61ede57ffd 100755 --- a/wrappers/ios/ci/build.sh +++ b/wrappers/ios/ci/build.sh @@ -15,8 +15,8 @@ for i in $(ls -t $OPENSSL_PATH); do break done -#INDY_VERSION="efb7215" # this is "v1.16.0" + rusql update fix + (number of other commits on master branch) -INDY_VERSION="b4b330ef3" # this is "v1.16.0" tag +INDY_VERSION="efb7215" # release indy-1.16.0-post-59 ## this is "v1.16.0" + rusql update fix + (number of other commits on master branch) +#INDY_VERSION="b4b330ef3" # this is "v1.16.0" tag REPO_DIR=$PWD SCRIPT_DIR="$( cd "$(dirname "$0")" ; pwd -P )" OUTPUT_DIR=/tmp/artifacts From ce8f2a8e68c1a0492655ee30260ebc744150be90 Mon Sep 17 00:00:00 2001 From: Patrik Stas Date: Thu, 24 Jun 2021 11:23:24 +0200 Subject: [PATCH 04/11] Binary search, try ios build with indy 32e30b6ca Signed-off-by: Patrik Stas --- agency_client/Cargo.toml | 4 ++-- libvcx/Cargo.toml | 6 +++--- wrappers/ios/ci/build.sh | 3 ++- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/agency_client/Cargo.toml b/agency_client/Cargo.toml index c1f8d59c74..646a4dac9d 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-post-59" +indy = "1.15.0-dev-1628" 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-post-59)" +depends = "libindy (= 1.15.0-dev-1628)" extended-description = """\ This is the official SDK for Hyperledger Indy, which provides a\ distributed-ledger-based foundation for self-sovereign identity.\ diff --git a/libvcx/Cargo.toml b/libvcx/Cargo.toml index 33118a7da3..8945eaa685 100644 --- a/libvcx/Cargo.toml +++ b/libvcx/Cargo.toml @@ -47,8 +47,8 @@ rmp-serde = "0.13.7" base64 = "0.8.0" openssl = { version = "0.10.29" } num-traits = "0.2.0" -indy = "1.16.0-post-59" -indy-sys = "1.16.0-post-59" +indy = "1.15.0-dev-1628" +indy-sys = "1.15.0-dev-1628" 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-post-59)" +depends = "libindy (= 1.15.0-dev-1628)" 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 61ede57ffd..8f383b8b9e 100755 --- a/wrappers/ios/ci/build.sh +++ b/wrappers/ios/ci/build.sh @@ -15,8 +15,9 @@ for i in $(ls -t $OPENSSL_PATH); do break done -INDY_VERSION="efb7215" # release indy-1.16.0-post-59 ## this is "v1.16.0" + rusql update fix + (number of other commits on master branch) +#INDY_VERSION="efb7215" # release indy-1.16.0-post-59 ## this is "v1.16.0" + rusql update fix + (number of other commits on master branch) #INDY_VERSION="b4b330ef3" # this is "v1.16.0" tag +INDY_VERSION="32e30b6ca" # between efb7215, b4b330ef3, indy-sys = "1.15.0-dev-1628" indy = "1.15.0-dev-1628" REPO_DIR=$PWD SCRIPT_DIR="$( cd "$(dirname "$0")" ; pwd -P )" OUTPUT_DIR=/tmp/artifacts From 8c566e2731c60c358d62c493dd1eaad76bf19a4c Mon Sep 17 00:00:00 2001 From: Patrik Stas Date: Thu, 24 Jun 2021 11:24:14 +0200 Subject: [PATCH 05/11] Add list of indy commits on masteer Signed-off-by: Patrik Stas --- wrappers/ios/ci/build.sh | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/wrappers/ios/ci/build.sh b/wrappers/ios/ci/build.sh index 8f383b8b9e..1c19bec8fb 100755 --- a/wrappers/ios/ci/build.sh +++ b/wrappers/ios/ci/build.sh @@ -15,6 +15,32 @@ for i in $(ls -t $OPENSSL_PATH); do break done +#efb72154dab94498861c43f9ac5208174e9b702c (HEAD -> master, origin/master, origin/HEAD) Merge pull request #2402 from hyperledger/update/update-rusqlite +#9fbbb7939440b67e92f2698e868f14c2432cce72 Merge pull request #2397 from ianco/postgres_updates +#794ad8a599f57e0f8e085e116251b96edbae0e40 Merge pull request #2392 from Nova-Scotia-Digital-Service/master +#e80e7092e4f3232b3ddf6841cd56619487e79eb0 Merge pull request #2389 from TimoGlastra/update-nodejs-wrapper +#503e8bc11302c35b8903f6296b372a32c690dd05 Merge branch 'master' into update-nodejs-wrapper +#8993d0b3f5cfe10c75d5d70d22b49e42ab4ee7c4 Merge pull request #2390 from ianco/rc +#4e4a7a29480ae4dbe27f6170a64d94ff6b02f4dd Merge branch 'master' into rc +#cb17e1bf4d534a22bfc9fc9d1e2219c15734e639 Merge branch 'master' into update-nodejs-wrapper +#1ea73bb92ad5682ab3e1f4422fa68c40d59197ea Merge branch 'master' into rc +#cc52f08778e279d400ac60f031e761a6536fe3e7 Merge pull request #2354 from mirgee/ga-workflow +#32e30b6ca307c201c3d16341887af2887c6d9562 Merge pull request #2366 from toshirin33/postgres_plugin_default_db 1628, 32e30b6ca +#12f1831efa8203b541bdc5d1645670ae48790538 (origin/rc) Merge branch 'master' into rc +#32c5d087c149878366c50fdb8e161d34657c22fd Merge branch 'master' into postgres_plugin_default_db +#8fa3c2ce9cb4978e4dc1f9bd57980437578b081a Merge pull request #2372 from baegjae/multi-wallet-md5 +#dbd89cf94a73e7a62611c4150a874c38b810ff8d Merge pull request #2368 from toshirin33/percent_encoding +#212ab8844de3fffa195bed86276d0fc04e94a442 Merge pull request #2362 from ianco/rc +#8c669cff434f5d87e7a2e2e192423c67a9df0b33 Merge pull request #2356 from adenishchenko/frozen_ledgers +#03f5482198311670a63095363ddb032c71fa4eff Merge pull request #2257 from Artemkaaas/bugfix/proof-request-restriction +#645299886f9282769fdcddbb742135e94a5691ac Merge branch 'master' into bugfix/proof-request-restriction +#88bbb9646418f269db1c3d29c4bb2b7ea52e1660 (mirgee/master) Merge pull request #2338 from adenishchenko/bucket_metrics +#506254c2c0afe87ed6834bfaff8f46800e78bcde Merge branch 'master' into bucket_metrics +#c2a36d369fe7a16a241c5711b5c49b945816d009 Merge pull request #2341 from AxelNennker/sha-version-0.9 +#7349f5684bff5eb84bc370f1c6c8fc7e8c054613 Merge pull request #2318 from adenishchenko/metrics_prometheus +#b4b330ef326958d593ab42e25679c2dcd655494c (tag: v1.16.0) Merge pull request #2335 from ianco/rc + + #INDY_VERSION="efb7215" # release indy-1.16.0-post-59 ## this is "v1.16.0" + rusql update fix + (number of other commits on master branch) #INDY_VERSION="b4b330ef3" # this is "v1.16.0" tag INDY_VERSION="32e30b6ca" # between efb7215, b4b330ef3, indy-sys = "1.15.0-dev-1628" indy = "1.15.0-dev-1628" From 41e92c5ab428a209f4265db8fa726c923a9133d3 Mon Sep 17 00:00:00 2001 From: Miroslav Kovar Date: Thu, 24 Jun 2021 13:07:28 +0200 Subject: [PATCH 06/11] Try using vendored feature Signed-off-by: Miroslav Kovar --- libvcx/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libvcx/Cargo.toml b/libvcx/Cargo.toml index 8945eaa685..2aa526fc06 100644 --- a/libvcx/Cargo.toml +++ b/libvcx/Cargo.toml @@ -45,7 +45,7 @@ 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.29", features = ["vendored"] } num-traits = "0.2.0" indy = "1.15.0-dev-1628" indy-sys = "1.15.0-dev-1628" From 4156ccda61a1311b2334a3895dc5a7ae8af435c4 Mon Sep 17 00:00:00 2001 From: Miroslav Kovar Date: Thu, 24 Jun 2021 15:06:08 +0200 Subject: [PATCH 07/11] Try using vendored for ios only Signed-off-by: Miroslav Kovar --- Cargo.lock | 12 ++++++++++++ libvcx/Cargo.toml | 5 ++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/Cargo.lock b/Cargo.lock index dc3119c700..2a76a731c9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,5 +1,7 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. +version = 3 + [[package]] name = "addr2line" version = "0.14.1" @@ -1078,6 +1080,15 @@ 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" @@ -1087,6 +1098,7 @@ dependencies = [ "autocfg 1.0.1", "cc", "libc", + "openssl-src", "pkg-config", "vcpkg", ] diff --git a/libvcx/Cargo.toml b/libvcx/Cargo.toml index 2aa526fc06..2b22e2c5f7 100644 --- a/libvcx/Cargo.toml +++ b/libvcx/Cargo.toml @@ -45,7 +45,7 @@ regex = "1.1.0" rust-base58 = "0.0.4" rmp-serde = "0.13.7" base64 = "0.8.0" -openssl = { version = "0.10.29", features = ["vendored"] } +openssl = { version = "0.10.29" } num-traits = "0.2.0" indy = "1.15.0-dev-1628" indy-sys = "1.15.0-dev-1628" @@ -95,3 +95,6 @@ provides = "libvcx (= 0.8.0)" [package.metadata.deb.variants.libvcx-bionic] name = "libvcx" provides = "libvcx (= 0.8.0)" + +[target.'cfg(target_os = "ios")'.dependencies] +openssl = { version = "0.10.29", features = ["vendored"] } From b3f2b7e4ef1ed2070bed7c6d143a287dfadc55b3 Mon Sep 17 00:00:00 2001 From: Patrik Stas Date: Thu, 24 Jun 2021 16:22:51 +0200 Subject: [PATCH 08/11] Use vendored openssl with rusql fix libindy version Signed-off-by: Patrik Stas --- agency_client/Cargo.toml | 4 ++-- libvcx/Cargo.toml | 6 +++--- wrappers/ios/ci/build.sh | 5 +++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/agency_client/Cargo.toml b/agency_client/Cargo.toml index 646a4dac9d..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.15.0-dev-1628" +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.15.0-dev-1628)" +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/libvcx/Cargo.toml b/libvcx/Cargo.toml index 2b22e2c5f7..15b5fee9c6 100644 --- a/libvcx/Cargo.toml +++ b/libvcx/Cargo.toml @@ -47,8 +47,8 @@ rmp-serde = "0.13.7" base64 = "0.8.0" openssl = { version = "0.10.29" } num-traits = "0.2.0" -indy = "1.15.0-dev-1628" -indy-sys = "1.15.0-dev-1628" +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.15.0-dev-1628)" +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 1c19bec8fb..69faaaf85a 100755 --- a/wrappers/ios/ci/build.sh +++ b/wrappers/ios/ci/build.sh @@ -41,9 +41,10 @@ done #b4b330ef326958d593ab42e25679c2dcd655494c (tag: v1.16.0) Merge pull request #2335 from ianco/rc -#INDY_VERSION="efb7215" # release indy-1.16.0-post-59 ## this is "v1.16.0" + rusql update fix + (number of other commits on master branch) +INDY_VERSION="efb7215" # release indy-1.16.0-post-59 ## this is "v1.16.0" + rusql update fix + (number of other commits on master branch) +#INDY_VERSION="v1.16.0" #INDY_VERSION="b4b330ef3" # this is "v1.16.0" tag -INDY_VERSION="32e30b6ca" # between efb7215, b4b330ef3, indy-sys = "1.15.0-dev-1628" indy = "1.15.0-dev-1628" +#INDY_VERSION="32e30b6ca" # between efb7215, b4b330ef3, indy-sys = "1.15.0-dev-1628" indy = "1.15.0-dev-1628" REPO_DIR=$PWD SCRIPT_DIR="$( cd "$(dirname "$0")" ; pwd -P )" OUTPUT_DIR=/tmp/artifacts From 1d34340b936f1c3a9bcc83715cb419b1266abd00 Mon Sep 17 00:00:00 2001 From: Miroslav Kovar Date: Thu, 24 Jun 2021 21:11:40 +0200 Subject: [PATCH 09/11] Try using OPENSSL_NO_VENDOR Signed-off-by: Miroslav Kovar --- ci/libvcx.dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/libvcx.dockerfile b/ci/libvcx.dockerfile index b6c8e12985..3210afe49f 100644 --- a/ci/libvcx.dockerfile +++ b/ci/libvcx.dockerfile @@ -6,6 +6,7 @@ WORKDIR /home/indy COPY --chown=indy ./ ./ USER indy +ENV OPENSSL_NO_VENDOR="true" RUN cargo build --release --manifest-path=/home/indy/Cargo.toml USER root From 2179967208b995be7d55612accab2576a0e762e3 Mon Sep 17 00:00:00 2001 From: Miroslav Kovar Date: Fri, 25 Jun 2021 12:14:31 +0200 Subject: [PATCH 10/11] Use vendored for all archs except musl via environment variables Signed-off-by: Miroslav Kovar --- .github/workflows/main.yml | 6 +++--- Cargo.lock | 10 ++++------ ci/alpine_core.dockerfile | 5 ++--- ci/libvcx.dockerfile | 4 ++-- ci/ubuntu.dockerfile | 2 +- libvcx/Cargo.toml | 5 +---- wrappers/ios/ci/build.sh | 2 +- wrappers/java/ci/android.dockerfile | 2 +- 8 files changed, 15 insertions(+), 21 deletions(-) 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 2a76a731c9..5525f50249 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,7 +1,5 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 - [[package]] name = "addr2line" version = "0.14.1" @@ -1062,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", @@ -1091,9 +1089,9 @@ dependencies = [ [[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", 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 3210afe49f..ecdbe4f8c7 100644 --- a/ci/libvcx.dockerfile +++ b/ci/libvcx.dockerfile @@ -6,7 +6,7 @@ WORKDIR /home/indy COPY --chown=indy ./ ./ USER indy -ENV OPENSSL_NO_VENDOR="true" +ENV X86_64_ALPINE_LINUX_MUSL_OPENSSL_NO_VENDOR "true" RUN cargo build --release --manifest-path=/home/indy/Cargo.toml USER root @@ -45,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 15b5fee9c6..5d12070f57 100644 --- a/libvcx/Cargo.toml +++ b/libvcx/Cargo.toml @@ -45,7 +45,7 @@ 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-post-59" indy-sys = "1.16.0-post-59" @@ -95,6 +95,3 @@ provides = "libvcx (= 0.8.0)" [package.metadata.deb.variants.libvcx-bionic] name = "libvcx" provides = "libvcx (= 0.8.0)" - -[target.'cfg(target_os = "ios")'.dependencies] -openssl = { version = "0.10.29", features = ["vendored"] } diff --git a/wrappers/ios/ci/build.sh b/wrappers/ios/ci/build.sh index 69faaaf85a..b3be1b187f 100755 --- a/wrappers/ios/ci/build.sh +++ b/wrappers/ios/ci/build.sh @@ -52,7 +52,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 From f6fb54e86247c618ae47532e9d30d80efb17e94d Mon Sep 17 00:00:00 2001 From: Miroslav Kovar Date: Fri, 25 Jun 2021 14:09:41 +0200 Subject: [PATCH 11/11] Remove comments Signed-off-by: Miroslav Kovar --- wrappers/ios/ci/build.sh | 31 +------------------------------ 1 file changed, 1 insertion(+), 30 deletions(-) diff --git a/wrappers/ios/ci/build.sh b/wrappers/ios/ci/build.sh index b3be1b187f..3df3a45f86 100755 --- a/wrappers/ios/ci/build.sh +++ b/wrappers/ios/ci/build.sh @@ -15,36 +15,7 @@ for i in $(ls -t $OPENSSL_PATH); do break done -#efb72154dab94498861c43f9ac5208174e9b702c (HEAD -> master, origin/master, origin/HEAD) Merge pull request #2402 from hyperledger/update/update-rusqlite -#9fbbb7939440b67e92f2698e868f14c2432cce72 Merge pull request #2397 from ianco/postgres_updates -#794ad8a599f57e0f8e085e116251b96edbae0e40 Merge pull request #2392 from Nova-Scotia-Digital-Service/master -#e80e7092e4f3232b3ddf6841cd56619487e79eb0 Merge pull request #2389 from TimoGlastra/update-nodejs-wrapper -#503e8bc11302c35b8903f6296b372a32c690dd05 Merge branch 'master' into update-nodejs-wrapper -#8993d0b3f5cfe10c75d5d70d22b49e42ab4ee7c4 Merge pull request #2390 from ianco/rc -#4e4a7a29480ae4dbe27f6170a64d94ff6b02f4dd Merge branch 'master' into rc -#cb17e1bf4d534a22bfc9fc9d1e2219c15734e639 Merge branch 'master' into update-nodejs-wrapper -#1ea73bb92ad5682ab3e1f4422fa68c40d59197ea Merge branch 'master' into rc -#cc52f08778e279d400ac60f031e761a6536fe3e7 Merge pull request #2354 from mirgee/ga-workflow -#32e30b6ca307c201c3d16341887af2887c6d9562 Merge pull request #2366 from toshirin33/postgres_plugin_default_db 1628, 32e30b6ca -#12f1831efa8203b541bdc5d1645670ae48790538 (origin/rc) Merge branch 'master' into rc -#32c5d087c149878366c50fdb8e161d34657c22fd Merge branch 'master' into postgres_plugin_default_db -#8fa3c2ce9cb4978e4dc1f9bd57980437578b081a Merge pull request #2372 from baegjae/multi-wallet-md5 -#dbd89cf94a73e7a62611c4150a874c38b810ff8d Merge pull request #2368 from toshirin33/percent_encoding -#212ab8844de3fffa195bed86276d0fc04e94a442 Merge pull request #2362 from ianco/rc -#8c669cff434f5d87e7a2e2e192423c67a9df0b33 Merge pull request #2356 from adenishchenko/frozen_ledgers -#03f5482198311670a63095363ddb032c71fa4eff Merge pull request #2257 from Artemkaaas/bugfix/proof-request-restriction -#645299886f9282769fdcddbb742135e94a5691ac Merge branch 'master' into bugfix/proof-request-restriction -#88bbb9646418f269db1c3d29c4bb2b7ea52e1660 (mirgee/master) Merge pull request #2338 from adenishchenko/bucket_metrics -#506254c2c0afe87ed6834bfaff8f46800e78bcde Merge branch 'master' into bucket_metrics -#c2a36d369fe7a16a241c5711b5c49b945816d009 Merge pull request #2341 from AxelNennker/sha-version-0.9 -#7349f5684bff5eb84bc370f1c6c8fc7e8c054613 Merge pull request #2318 from adenishchenko/metrics_prometheus -#b4b330ef326958d593ab42e25679c2dcd655494c (tag: v1.16.0) Merge pull request #2335 from ianco/rc - - -INDY_VERSION="efb7215" # release indy-1.16.0-post-59 ## this is "v1.16.0" + rusql update fix + (number of other commits on master branch) -#INDY_VERSION="v1.16.0" -#INDY_VERSION="b4b330ef3" # this is "v1.16.0" tag -#INDY_VERSION="32e30b6ca" # between efb7215, b4b330ef3, indy-sys = "1.15.0-dev-1628" indy = "1.15.0-dev-1628" +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