Skip to content

build: add workarounds required to build tests #128

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

Merged
mooori merged 2 commits into from
Jan 18, 2024
Merged

build: add workarounds required to build tests #128

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1c0aa33
build: patch a yanked near-sdk dependency
mooori Jan 18, 2024
89b1af7
Update `scripts/fix_dependencies`
mooori Jan 18, 2024
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
5 changes: 5 additions & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,3 +35,8 @@ proc-macro2 = "1.0"
quote = "1.0.9"
syn = { version = "1.0.69", features = ["full"] }
proc-macro-crate = "0.1.5"

# Required to build tests with near-sdk v4.1.1, see #128.
# TODO(#125): Remove after upgrading to near-sdk v5.
[patch.crates-io]
parity-secp256k1 = {git = "https://github.com/paritytech/rust-secp256k1", tag = "parity-secp256k1-v0.7.0"}
5 changes: 5 additions & 0 deletions near-plugins-derive/tests/contracts/access_controllable/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,8 @@ panic = "abort"
overflow-checks = true

[workspace]

# Required to build tests with near-sdk v4.1.1, see #128.
# TODO(#125): Remove after upgrading to near-sdk v5.
[patch.crates-io]
parity-secp256k1 = {git = "https://github.com/paritytech/rust-secp256k1", tag = "parity-secp256k1-v0.7.0"}
5 changes: 5 additions & 0 deletions near-plugins-derive/tests/contracts/ownable/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,8 @@ panic = "abort"
overflow-checks = true

[workspace]

# Required to build tests with near-sdk v4.1.1, see #128.
# TODO(#125): Remove after upgrading to near-sdk v5.
[patch.crates-io]
parity-secp256k1 = {git = "https://github.com/paritytech/rust-secp256k1", tag = "parity-secp256k1-v0.7.0"}
5 changes: 5 additions & 0 deletions near-plugins-derive/tests/contracts/pausable/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,8 @@ panic = "abort"
overflow-checks = true

[workspace]

# Required to build tests with near-sdk v4.1.1, see #128.
# TODO(#125): Remove after upgrading to near-sdk v5.
[patch.crates-io]
parity-secp256k1 = {git = "https://github.com/paritytech/rust-secp256k1", tag = "parity-secp256k1-v0.7.0"}
5 changes: 5 additions & 0 deletions near-plugins-derive/tests/contracts/upgradable/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,8 @@ panic = "abort"
overflow-checks = true

[workspace]

# Required to build tests with near-sdk v4.1.1, see #128.
# TODO(#125): Remove after upgrading to near-sdk v5.
[patch.crates-io]
parity-secp256k1 = {git = "https://github.com/paritytech/rust-secp256k1", tag = "parity-secp256k1-v0.7.0"}
5 changes: 5 additions & 0 deletions near-plugins-derive/tests/contracts/upgradable_2/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,8 @@ panic = "abort"
overflow-checks = true

[workspace]

# Required to build tests with near-sdk v4.1.1, see #128.
# TODO(#125): Remove after upgrading to near-sdk v5.
[patch.crates-io]
parity-secp256k1 = {git = "https://github.com/paritytech/rust-secp256k1", tag = "parity-secp256k1-v0.7.0"}
5 changes: 5 additions & 0 deletions near-plugins-derive/tests/contracts/upgradable_state_migration/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,8 @@ panic = "abort"
overflow-checks = true

[workspace]

# Required to build tests with near-sdk v4.1.1, see #128.
# TODO(#125): Remove after upgrading to near-sdk v5.
[patch.crates-io]
parity-secp256k1 = {git = "https://github.com/paritytech/rust-secp256k1", tag = "parity-secp256k1-v0.7.0"}
9 changes: 7 additions & 2 deletions scripts/fix_dependencies.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,12 @@
# version of `clap` is released, say 4.4.8, then below must be changed to `-p clap@4.4.8`. Even
# though this requires maintenance, it seems to be cleanest approach that works with CI (see #119
# for some other attempts and how they failed in CI).
cargo update -p ahash@0.8.7 --precise 0.8.4
cargo update -p anstyle@1.0.4 --precise 1.0.2
cargo update -p anstyle-parse@0.2.2 --precise 0.2.1
cargo update -p clap@4.4.8 --precise 4.3.24
cargo update -p anstyle-parse@0.2.3 --precise 0.2.1
cargo update -p anstyle-query@1.0.2 --precise 1.0.0
cargo update -p cargo-platform@0.1.6 --precise 0.1.5
cargo update -p clap@4.4.18 --precise 4.3.24
cargo update -p clap_lex@0.5.1 --precise 0.5.0
cargo update -p colored@2.1.0 --precise 2.0.4
cargo update -p home@0.5.9 --precise 0.5.5