From dc421f586e4b443c6449d93cf972fa6d7dc2355f Mon Sep 17 00:00:00 2001 From: Ondrej Prazak Date: Tue, 13 Feb 2024 13:56:08 +0100 Subject: [PATCH] fix: use selected rust toolchain in ci Signed-off-by: Ondrej Prazak --- .github/actions/setup-testing-nodejs/action.yml | 1 + .github/actions/setup-testing-rust/action.yml | 2 +- .github/workflows/main.yml | 9 +-------- .github/workflows/mediator.pr.yml | 2 +- Cargo.lock | 4 ++-- aries/aries_vcx_core/Cargo.toml | 2 +- 6 files changed, 7 insertions(+), 13 deletions(-) diff --git a/.github/actions/setup-testing-nodejs/action.yml b/.github/actions/setup-testing-nodejs/action.yml index 86dfc49019..9dc065f2b5 100644 --- a/.github/actions/setup-testing-nodejs/action.yml +++ b/.github/actions/setup-testing-nodejs/action.yml @@ -27,6 +27,7 @@ runs: - uses: actions-rs/toolchain@v1 with: toolchain: ${{ inputs.rust-toolchain-version }} + default: true - uses: Swatinem/rust-cache@v2 - name: "Install dependencies" shell: bash diff --git a/.github/actions/setup-testing-rust/action.yml b/.github/actions/setup-testing-rust/action.yml index b83a1eb468..2c5cb7f73a 100644 --- a/.github/actions/setup-testing-rust/action.yml +++ b/.github/actions/setup-testing-rust/action.yml @@ -20,7 +20,7 @@ runs: - uses: actions-rs/toolchain@v1 with: toolchain: ${{ inputs.rust-toolchain-version }} - + default: true - uses: Swatinem/rust-cache@v2 - name: "Install dependencies" shell: bash diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 6ef4a9b634..193417e15f 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -54,6 +54,7 @@ jobs: - uses: actions-rs/toolchain@v1 with: toolchain: ${{ env.RUST_TOOLCHAIN_VERSION }} + default: true - name: "Construct CI run-info" id: run-info uses: ./.github/actions/construct-run-info @@ -270,7 +271,6 @@ jobs: uses: ./.github/actions/setup-testing-rust with: rust-toolchain-version: ${{ env.RUST_TOOLCHAIN_VERSION }} - default: true skip-docker-setup: true - name: "Run workspace unit tests" run: RUST_TEST_THREADS=1 cargo test --workspace --lib --exclude aries-vcx-agent --exclude libvdrtools --exclude wallet_migrator --exclude mediator @@ -285,7 +285,6 @@ jobs: uses: ./.github/actions/setup-testing-rust with: rust-toolchain-version: ${{ env.RUST_TOOLCHAIN_VERSION }} - default: true - name: "Run aries-vcx integration tests" run: cargo test --manifest-path="aries/aries_vcx/Cargo.toml" -F vdrtools_wallet,credx -- --ignored; @@ -299,7 +298,6 @@ jobs: uses: ./.github/actions/setup-testing-rust with: rust-toolchain-version: ${{ env.RUST_TOOLCHAIN_VERSION }} - default: true - name: "Run anoncreds-rs integration tests" run: cargo test --manifest-path="aries/aries_vcx/Cargo.toml" -F anoncreds --test test_revocations --test test_proof_presentation --test test_anoncreds -- --ignored @@ -313,7 +311,6 @@ jobs: uses: ./.github/actions/setup-testing-rust with: rust-toolchain-version: ${{ env.RUST_TOOLCHAIN_VERSION }} - default: true - name: "Run aries_vcx tests: mysql_test" run: cargo test --manifest-path="aries/aries_vcx/Cargo.toml" test_mysql -- --include-ignored; @@ -337,7 +334,6 @@ jobs: uses: ./.github/actions/setup-testing-rust with: rust-toolchain-version: ${{ env.RUST_TOOLCHAIN_VERSION }} - default: true skip-vdrproxy-setup: false - name: "Run aries_vcx tests: vdrproxy_test" run: cargo test --manifest-path="aries/aries_vcx/Cargo.toml" -F vdr_proxy_ledger,credx -- --ignored @@ -358,7 +354,6 @@ jobs: uses: ./.github/actions/setup-testing-rust with: rust-toolchain-version: ${{ env.RUST_TOOLCHAIN_VERSION }} - default: true - name: "Run libvcx_core integration tests" run: | RUST_TEST_THREADS=1 cargo test --manifest-path="aries/misc/legacy/libvcx_core/Cargo.toml" -- --include-ignored; @@ -374,7 +369,6 @@ jobs: uses: ./.github/actions/setup-testing-rust with: rust-toolchain-version: ${{ env.RUST_TOOLCHAIN_VERSION }} - default: true - name: "Run resolver tests" run: | cargo test --examples -p did_doc -p did_parser -p did_resolver -p did_resolver_registry -p did_resolver_sov -p did_resolver_web -p did_doc_sov -p did_key -p did_peer --test "*" @@ -393,7 +387,6 @@ jobs: uses: ./.github/actions/setup-testing-nodejs with: rust-toolchain-version: ${{ env.RUST_TOOLCHAIN_VERSION }} - default: true node-version: ${{ matrix.node-version }} - name: "Run wrapper integration tests" run: (cd aries/wrappers/node && npm run test:integration) diff --git a/.github/workflows/mediator.pr.yml b/.github/workflows/mediator.pr.yml index 0475c9ac60..519688dd97 100644 --- a/.github/workflows/mediator.pr.yml +++ b/.github/workflows/mediator.pr.yml @@ -19,7 +19,7 @@ env: DOCKER_REPO_LOCAL_VDRPROXY: vdrproxy - RUST_TOOLCHAIN_VERSION: 1.70.0 + RUST_TOOLCHAIN_VERSION: 1.74.1 NODE_VERSION: 18.x jobs: diff --git a/Cargo.lock b/Cargo.lock index c9eabc8afb..f9cc84ca6e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -297,8 +297,8 @@ dependencies = [ [[package]] name = "anoncreds" -version = "0.2.0-dev.5" -source = "git+https://github.com/mirgee/anoncreds-rs.git?rev=9a7539c#9a7539c62dc0ee65891c2d94b66b7986ef33f210" +version = "0.2.0-dev.7" +source = "git+https://github.com/mirgee/anoncreds-rs.git?rev=a85d739#a85d739c10a90834dbd912508cbceba77b114b64" dependencies = [ "anoncreds-clsignatures 0.3.1", "base64", diff --git a/aries/aries_vcx_core/Cargo.toml b/aries/aries_vcx_core/Cargo.toml index ea5ad82b94..9e93be077f 100644 --- a/aries/aries_vcx_core/Cargo.toml +++ b/aries/aries_vcx_core/Cargo.toml @@ -18,7 +18,7 @@ agency_client = { path = "../misc/legacy/agency_client" } indy-vdr = { git = "https://github.com/hyperledger/indy-vdr.git", rev = "c143268", default-features = false, features = ["log"] } indy-credx = { git = "https://github.com/hyperledger/indy-shared-rs", tag = "v1.1.0", optional = true } # anoncreds = { git = "https://github.com/hyperledger/anoncreds-rs", tag = "v0.2.0-dev.5", optional = true } -anoncreds = { git = "https://github.com/mirgee/anoncreds-rs.git", rev = "9a7539c", optional = true } +anoncreds = { git = "https://github.com/mirgee/anoncreds-rs.git", rev = "a85d739", optional = true } anoncreds_types = { path = "../misc/anoncreds_types" } libvdrtools = { path = "../misc/legacy/libvdrtools", optional = true } indy-api-types = { path = "../misc/legacy/libvdrtools/indy-api-types", optional = true }