From da9d0b30dc1e7cd9b1ed5d7096089bbf3e4d888d Mon Sep 17 00:00:00 2001 From: 4ever2 <3417013+4ever2@users.noreply.github.com> Date: Wed, 19 Jun 2024 22:29:07 +0200 Subject: [PATCH] Fix rust test dependencies --- .github/workflows/build.yml | 1 + .../extracted-code/concordium-extract/concert-std/Cargo.toml | 5 ++++- .../concordium-extract/counter-extracted/Cargo.toml | 4 +++- .../concordium-extract/escrow-extracted/Cargo.toml | 5 ++++- .../concordium-extract/interp-extracted/Cargo.toml | 5 ++++- 5 files changed, 16 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e605aac6..ccccf30d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -112,6 +112,7 @@ jobs: - name: Test extraction run: | echo "::group::Running tests" + git config --global url.https://github.com/.insteadOf git@github.com: make -j${{ env.JOBS }} test-extraction echo "::endgroup::" diff --git a/extraction/tests/extracted-code/concordium-extract/concert-std/Cargo.toml b/extraction/tests/extracted-code/concordium-extract/concert-std/Cargo.toml index c051be45..69ba0a02 100644 --- a/extraction/tests/extracted-code/concordium-extract/concert-std/Cargo.toml +++ b/extraction/tests/extracted-code/concordium-extract/concert-std/Cargo.toml @@ -7,10 +7,13 @@ edition = "2018" crate-type = ["rlib"] [dependencies] -bumpalo = "3.5.0" +bumpalo = "=3.5.0" concert-std-derive = { path = "../concert-std-derive" } immutable-map = "0.1.2" +[patch.crates-io] +concordium-std-derive = { git = "https://github.com/Concordium/concordium-rust-smart-contracts", rev="4d4b024b547a1f120f6d6951cbc409c94f8f146a" } + [dependencies.concordium-std] version = "2.0.0" default-features = false diff --git a/extraction/tests/extracted-code/concordium-extract/counter-extracted/Cargo.toml b/extraction/tests/extracted-code/concordium-extract/counter-extracted/Cargo.toml index f436b14f..a0952cd0 100644 --- a/extraction/tests/extracted-code/concordium-extract/counter-extracted/Cargo.toml +++ b/extraction/tests/extracted-code/concordium-extract/counter-extracted/Cargo.toml @@ -11,9 +11,11 @@ std = ["concordium-std/std"] [dependencies] concert-std = { path = "../concert-std" } -bumpalo = "3.5.0" +bumpalo = "=3.5.0" immutable-map = "0.1.2" +[patch.crates-io] +concordium-std-derive = { git = "https://github.com/Concordium/concordium-rust-smart-contracts", rev="4d4b024b547a1f120f6d6951cbc409c94f8f146a" } [dependencies.concordium-std] version = "2.0.0" diff --git a/extraction/tests/extracted-code/concordium-extract/escrow-extracted/Cargo.toml b/extraction/tests/extracted-code/concordium-extract/escrow-extracted/Cargo.toml index 1490bf55..d97dbe0b 100644 --- a/extraction/tests/extracted-code/concordium-extract/escrow-extracted/Cargo.toml +++ b/extraction/tests/extracted-code/concordium-extract/escrow-extracted/Cargo.toml @@ -11,9 +11,12 @@ std = ["concordium-std/std"] [dependencies] concert-std = { path = "../concert-std" } -bumpalo = "3.5.0" +bumpalo = "=3.5.0" immutable-map = "0.1.2" +[patch.crates-io] +concordium-std-derive = { git = "https://github.com/Concordium/concordium-rust-smart-contracts", rev="4d4b024b547a1f120f6d6951cbc409c94f8f146a" } + [dependencies.concordium-std] version = "2.0.0" default-features = false diff --git a/extraction/tests/extracted-code/concordium-extract/interp-extracted/Cargo.toml b/extraction/tests/extracted-code/concordium-extract/interp-extracted/Cargo.toml index 9d2fce9f..86d7ed9f 100644 --- a/extraction/tests/extracted-code/concordium-extract/interp-extracted/Cargo.toml +++ b/extraction/tests/extracted-code/concordium-extract/interp-extracted/Cargo.toml @@ -11,9 +11,12 @@ std = ["concordium-std/std"] [dependencies] concert-std = { path = "../concert-std" } -bumpalo = "3.5.0" +bumpalo = "=3.5.0" immutable-map = "0.1.2" +[patch.crates-io] +concordium-std-derive = { git = "https://github.com/Concordium/concordium-rust-smart-contracts", rev="4d4b024b547a1f120f6d6951cbc409c94f8f146a" } + [dependencies.concordium-std] version = "2.0.0" default-features = false