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.

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

chore: fix publish pipeline #9057

Merged
merged 3 commits into from
May 17, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 5 additions & 11 deletions Cargo.lock

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

41 changes: 20 additions & 21 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,3 +1,16 @@
[workspace.package]
version = "0.0.0" # managed by cargo-workspaces, see below
authors = ["Near Inc <hello@nearprotocol.com>"]
edition = "2021"
rust-version = "1.69.0"
repository = "https://github.com/near/nearcore"
license = "MIT OR Apache-2.0"

[workspace.metadata.workspaces]
# shared version of all public crates in the workspace
version = "0.16.1"
exclude = ["neard"]

[workspace]
members = [
"chain/chain",
Expand Down Expand Up @@ -75,10 +88,6 @@ members = [
"utils/stdx",
]

[workspace.metadata.workspaces]
version = "0.16.1"
exclude = [ "neard" ]

[workspace.dependencies]
actix = "0.13.0"
actix-cors = "0.6.1"
Expand Down Expand Up @@ -135,7 +144,7 @@ flate2 = "1.0.22"
fs2 = "0.4"
futures = "0.3.5"
futures-util = "0.3"
genesis-populate = { path = "genesis-tools/genesis-populate"}
genesis-populate = { path = "genesis-tools/genesis-populate" }
hashbrown = "0.11"
hex = { version = "0.4.2", features = ["serde"] }
hex-literal = "0.2"
Expand All @@ -160,7 +169,7 @@ lru = "0.7.2"
memmap2 = "0.5"
memoffset = "0.6"
more-asserts = "0.2"
near-account-id = { path = "core/account-id", features = [ "internal_unstable" ] }
near-account-id = { path = "core/account-id", features = ["internal_unstable"] }
near-actix-test-utils = { path = "test-utils/actix-test-utils" }
near-amend-genesis = { path = "tools/amend-genesis" }
near-async = { path = "core/async" }
Expand All @@ -171,7 +180,7 @@ near-chain-primitives = { path = "chain/chain-primitives" }
near-chunks = { path = "chain/chunks" }
near-chunks-primitives = { path = "chain/chunks-primitives" }
near-client = { path = "chain/client" }
near-client-primitives = {path = "chain/client-primitives"}
near-client-primitives = { path = "chain/client-primitives" }
near-cold-store-tool = { path = "tools/cold-store", package = "cold-store-tool" }
near-config-utils = { path = "utils/config" }
nearcore = { path = "nearcore" }
Expand Down Expand Up @@ -208,14 +217,14 @@ near-telemetry = { path = "chain/telemetry" }
near-test-contracts = { path = "runtime/near-test-contracts" }
near-undo-block = { path = "tools/undo-block" }
near-vm = { path = "runtime/near-vm/api" }
near-vm-compiler = { path = "runtime/near-vm/compiler"}
near-vm-compiler = { path = "runtime/near-vm/compiler" }
near-vm-compiler-singlepass = { path = "runtime/near-vm/compiler-singlepass" }
near-vm-compiler-test-derive = { path = "runtime/near-vm/compiler-test-derive" }
near-vm-engine = { path = "runtime/near-vm/engine" }
near-vm-engine-universal = { path = "runtime/near-vm/engine-universal" }
near-vm-errors = { path = "runtime/near-vm-errors" }
near-vm-logic = { path = "runtime/near-vm-logic" }
near-vm-runner = { path = "runtime/near-vm-runner"}
near-vm-runner = { path = "runtime/near-vm-runner" }
near-vm-test-generator = { path = "runtime/near-vm/test-generator" }
near-vm-types = { path = "runtime/near-vm/types" }
near-vm-vm = { path = "runtime/near-vm/vm" }
Expand Down Expand Up @@ -262,7 +271,7 @@ rkyv = "0.7.31"
rlimit = "0.7"
rocksdb = { version = "0.19.0", default-features = false, features = ["snappy", "lz4", "zstd", "zlib", "jemalloc"] }
runtime-tester = { path = "test-utils/runtime-tester" }
rusqlite = {version = "0.27.0", features = ["bundled", "chrono", "functions"] }
rusqlite = { version = "0.27.0", features = ["bundled", "chrono", "functions"] }
rustc-demangle = "0.1"
rust-s3 = { version = "0.32.3", features = ["blocking"] }
secp256k1 = { version = "0.27.0", features = ["recovery", "rand-std"] }
Expand Down Expand Up @@ -325,12 +334,7 @@ winapi = { version = "0.3", features = ["winbase", "memoryapi", "errhandlingapi"
xshell = "0.2.1"
xz2 = "0.1.6"

# Polyfill crate introduced in https://github.com/near/nearcore/pull/8087
# Because public crates depend on it, we have to also publish this.
# When changing the workspace version, set this back to a local dependency and
# then update again to the higher published version once we release crates again.
# TODO(#8604): Fix this process.
stdx = { package = "near-stdx", version = "0.16.0" }
stdx = { package = "near-stdx", path = "utils/stdx" }

[patch.crates-io]

Expand Down Expand Up @@ -363,8 +367,3 @@ opt-level = 3
opt-level = 3
[profile.dev.package.sha2]
opt-level = 3

[workspace.package]
edition = "2021"
authors = ["Near Inc <hello@nearprotocol.com>"]
rust-version = "1.69.0"
11 changes: 5 additions & 6 deletions chain/chain-primitives/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
[package]
name = "near-chain-primitives"
version = "0.0.0"
version.workspace = true
authors.workspace = true
publish = true
# Please update rust-toolchain.toml as well when changing version here:
rust-version.workspace = true
edition.workspace = true
license = "MIT OR Apache-2.0"
repository = "https://github.com/near/nearcore"
rust-version.workspace = true
description = "This crate hosts NEAR chain-related error types"
repository.workspace = true
license.workspace = true
publish = true

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

Expand Down
4 changes: 2 additions & 2 deletions chain/chain/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
[package]
name = "near-chain"
version = "0.0.0"
version.workspace = true
authors.workspace = true
publish = false
edition.workspace = true
publish = false

[dependencies]
actix.workspace = true
Expand Down
11 changes: 5 additions & 6 deletions chain/chunks-primitives/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
[package]
name = "near-chunks-primitives"
version = "0.0.0"
version.workspace = true
authors.workspace = true
publish = true
# Please update rust-toolchain.toml as well when changing version here:
rust-version.workspace = true
edition.workspace = true
license = "MIT OR Apache-2.0"
repository = "https://github.com/near/nearcore"
rust-version.workspace = true
description = "This crate hosts NEAR chunks-related error types"
repository.workspace = true
license.workspace = true
publish = true

[dependencies]
near-chain-primitives.workspace = true
Expand Down
7 changes: 5 additions & 2 deletions chain/chunks/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
[package]
name = "near-chunks"
version = "0.0.0"
version.workspace = true
authors.workspace = true
publish = false
edition.workspace = true
rust-version.workspace = true
repository.workspace = true
license.workspace = true
publish = false

[dependencies]
actix.workspace = true
Expand Down
13 changes: 5 additions & 8 deletions chain/client-primitives/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,16 +1,13 @@
[package]
name = "near-client-primitives"
version = "0.0.0"
version.workspace = true
authors.workspace = true
publish = true
# Please update rust-toolchain.toml as well when changing version here:
rust-version.workspace = true
edition.workspace = true
license = "MIT OR Apache-2.0"
repository = "https://github.com/near/nearcore"
rust-version.workspace = true
description = "This crate hosts NEAR client-related error types"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
repository.workspace = true
license.workspace = true
publish = true

[dependencies]
actix.workspace = true
Expand Down
7 changes: 5 additions & 2 deletions chain/client/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
[package]
name = "near-client"
version = "0.0.0"
version.workspace = true
authors.workspace = true
publish = false
edition.workspace = true
rust-version.workspace = true
repository.workspace = true
license.workspace = true
publish = false

[dependencies]
actix-rt.workspace = true
Expand Down
8 changes: 5 additions & 3 deletions chain/epoch-manager/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
[package]
name = "near-epoch-manager"
version = "0.0.0"
version.workspace = true
authors.workspace = true
publish = false
edition.workspace = true

rust-version.workspace = true
repository.workspace = true
license.workspace = true
publish = false

[dependencies]
borsh.workspace = true
Expand Down
11 changes: 5 additions & 6 deletions chain/indexer-primitives/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,14 +1,13 @@
[package]
name = "near-indexer-primitives"
version = "0.0.0"
version.workspace = true
authors.workspace = true
publish = true
# Please update rust-toolchain.toml as well when changing version here:
rust-version.workspace = true
edition.workspace = true
license = "MIT OR Apache-2.0"
repository = "https://github.com/near/nearcore"
rust-version.workspace = true
description = "This crate hosts structures for the NEAR Indexer Framework types"
repository.workspace = true
license.workspace = true
publish = true

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

Expand Down
7 changes: 5 additions & 2 deletions chain/indexer/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
[package]
name = "near-indexer"
version = "0.0.0"
version.workspace = true
authors.workspace = true
publish = false
edition.workspace = true
rust-version.workspace = true
repository.workspace = true
license.workspace = true
publish = false

[dependencies]
actix.workspace = true
Expand Down
7 changes: 5 additions & 2 deletions chain/jsonrpc-adversarial-primitives/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
[package]
name = "near-jsonrpc-adversarial-primitives"
version = "0.0.0"
version.workspace = true
authors.workspace = true
publish = false
edition.workspace = true
rust-version.workspace = true
repository.workspace = true
license.workspace = true
publish = false

[dependencies]
serde.workspace = true
Expand Down
13 changes: 5 additions & 8 deletions chain/jsonrpc-primitives/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,16 +1,13 @@
[package]
name = "near-jsonrpc-primitives"
version = "0.0.0"
version.workspace = true
authors.workspace = true
publish = true
# Please update rust-toolchain.toml as well when changing version here:
rust-version.workspace = true
edition.workspace = true
license = "MIT OR Apache-2.0"
repository = "https://github.com/near/nearcore"
rust-version.workspace = true
description = "This crate hosts structures for the NEAR JSON RPC Requests, Responses and Error types"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
repository.workspace = true
license.workspace = true
publish = true

[dependencies]
arbitrary.workspace = true
Expand Down
7 changes: 5 additions & 2 deletions chain/jsonrpc/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
[package]
name = "near-jsonrpc"
version = "0.0.0"
version.workspace = true
authors.workspace = true
publish = false
edition.workspace = true
rust-version.workspace = true
repository.workspace = true
license.workspace = true
publish = false

[dependencies]
actix-cors.workspace = true
Expand Down
7 changes: 5 additions & 2 deletions chain/jsonrpc/client/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
[package]
name = "near-jsonrpc-client"
version = "0.0.0"
version.workspace = true
authors.workspace = true
publish = false
edition.workspace = true
rust-version.workspace = true
repository.workspace = true
license.workspace = true
publish = false

[dependencies]
actix-http.workspace = true
Expand Down
7 changes: 5 additions & 2 deletions chain/jsonrpc/fuzz/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
[package]
name = "near-jsonrpc-fuzz"
version = "0.0.0"
version.workspace = true
authors.workspace = true
publish = false
edition.workspace = true
rust-version.workspace = true
repository.workspace = true
license.workspace = true
publish = false

[package.metadata]
cargo-fuzz = true
Expand Down
Loading