Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: use selected rust toolchain in ci #1126

Merged
merged 1 commit into from
Feb 14, 2024
Merged

fix: use selected rust toolchain in ci #1126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .github/actions/setup-testing-nodejs/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/setup-testing-rust/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 1 addition & 8 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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;

Expand All @@ -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

Expand All @@ -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;

Expand All @@ -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
Expand All @@ -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;
Expand All @@ -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 "*"
Expand All @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/mediator.pr.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion aries/aries_vcx_core/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Patrik-Stas marked this conversation as resolved.
Show resolved Hide resolved
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 }
Expand Down
Loading