From 41ea29f58aa3d291eb24fc414ee8cdb1deae50d8 Mon Sep 17 00:00:00 2001 From: Patrik Date: Thu, 11 Jan 2024 12:38:45 +0100 Subject: [PATCH] CI: Fix toolchain version (#1107) * Fix toolchain version --------- Signed-off-by: Patrik Stas --- .github/workflows/main.yml | 37 ++++++++++++++++++++----------- .github/workflows/mediator.pr.yml | 4 ++-- 2 files changed, 26 insertions(+), 15 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 05b4f88019..84dcb16b86 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -17,7 +17,7 @@ env: DOCKER_REPO_LOCAL_VDRPROXY: vdrproxy - RUST_TOOLCHAIN_VERSON: 1.70.0 + RUST_TOOLCHAIN_VERSION: 1.74.1 NODE_VERSION: 18.x jobs: @@ -53,7 +53,7 @@ jobs: uses: actions/checkout@v1 - uses: actions-rs/toolchain@v1 with: - toolchain: ${{ env.RUST_TOOLCHAIN_VERSON }} + toolchain: ${{ env.RUST_TOOLCHAIN_VERSION }} - name: "Construct CI run-info" id: run-info uses: ./.github/actions/construct-run-info @@ -101,7 +101,8 @@ jobs: uses: actions/checkout@v3 - uses: actions-rs/toolchain@v1 with: - toolchain: ${{ env.RUST_TOOLCHAIN_VERSON }} + toolchain: ${{ env.RUST_TOOLCHAIN_VERSION }} + default: true components: clippy - name: "Install dependencies" shell: bash @@ -124,7 +125,8 @@ jobs: uses: actions/checkout@v3 - uses: actions-rs/toolchain@v1 with: - toolchain: ${{ env.RUST_TOOLCHAIN_VERSON }} + toolchain: ${{ env.RUST_TOOLCHAIN_VERSION }} + default: true components: clippy - name: "Install dependencies" shell: bash @@ -147,7 +149,8 @@ jobs: uses: actions/checkout@v3 - uses: actions-rs/toolchain@v1 with: - toolchain: ${{ env.RUST_TOOLCHAIN_VERSON }} + toolchain: ${{ env.RUST_TOOLCHAIN_VERSION }} + default: true components: clippy - name: "Install dependencies" shell: bash @@ -266,7 +269,8 @@ jobs: - name: "Setup rust testing environment" uses: ./.github/actions/setup-testing-rust with: - rust-toolchain-version: ${{ env.RUST_TOOLCHAIN_VERSON }} + 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 @@ -280,7 +284,8 @@ jobs: - name: "Setup rust testing environment" uses: ./.github/actions/setup-testing-rust with: - rust-toolchain-version: ${{ env.RUST_TOOLCHAIN_VERSON }} + 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; @@ -293,7 +298,8 @@ jobs: - name: "Setup rust testing environment" uses: ./.github/actions/setup-testing-rust with: - rust-toolchain-version: ${{ env.RUST_TOOLCHAIN_VERSON }} + 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; @@ -316,7 +322,8 @@ jobs: - name: "Setup rust testing environment" uses: ./.github/actions/setup-testing-rust with: - rust-toolchain-version: ${{ env.RUST_TOOLCHAIN_VERSON }} + 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 @@ -336,7 +343,8 @@ jobs: - name: "Setup rust testing environment" uses: ./.github/actions/setup-testing-rust with: - rust-toolchain-version: ${{ env.RUST_TOOLCHAIN_VERSON }} + 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; @@ -351,7 +359,8 @@ jobs: - name: "Setup rust testing environment" uses: ./.github/actions/setup-testing-rust with: - rust-toolchain-version: ${{ env.RUST_TOOLCHAIN_VERSON }} + 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 "*" @@ -369,7 +378,8 @@ jobs: - name: "Setup NodeJS libvcx testing environment" uses: ./.github/actions/setup-testing-nodejs with: - rust-toolchain-version: ${{ env.RUST_TOOLCHAIN_VERSON }} + 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) @@ -504,7 +514,8 @@ jobs: target: ${{ matrix.settings.target }} build: ${{ matrix.settings.build }} node-version: ${{ env.NODE_VERSION }} - rust-version: ${{ env.RUST_TOOLCHAIN_VERSON }} + rust-version: ${{ env.RUST_TOOLCHAIN_VERSION }} + default: true publish-napi: runs-on: ubuntu-20.04 diff --git a/.github/workflows/mediator.pr.yml b/.github/workflows/mediator.pr.yml index 185a9183e0..0475c9ac60 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_VERSON: 1.70.0 + RUST_TOOLCHAIN_VERSION: 1.70.0 NODE_VERSION: 18.x jobs: @@ -44,7 +44,7 @@ jobs: - name: "Setup rust testing environment" uses: ./.github/actions/setup-testing-rust with: - rust-toolchain-version: ${{ env.RUST_TOOLCHAIN_VERSON }} + rust-toolchain-version: ${{ env.RUST_TOOLCHAIN_VERSION }} skip-docker-setup: true skip-vdrproxy-setup: true - name: Install prerequisites (sqlx)