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

chore: fix crates.io publishing and pin core dependencies #3550

Closed
wants to merge 2 commits into from
+113 −36
Closed

chore: fix crates.io publishing and pin core dependencies #3550

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
2415ba6
chore: crates.io publishing update
antonbaliasnikov Jan 29, 2025
7a8c731
chore: pin core dependencies
antonbaliasnikov Jan 29, 2025
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: 4 additions & 1 deletion .github/workflows/publish-crates.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,9 @@ jobs:

publish-crates:
name: Publish to crates.io
runs-on: matterlabs-ci-runner-high-performance
runs-on: matterlabs-ci-runner-highdisk
env:
ZKSYNC_USE_CUDA_STUBS: true
steps:
- name: Publish crates
uses: matter-labs/zksync-ci-common/.github/actions/publish-crates@v1
Expand All @@ -40,3 +42,4 @@ jobs:
run_build: ${{ inputs.run-build }}
run_tests: ${{ inputs.run-tests }}
gh_token: ${{ secrets.GITHUB_TOKEN }}
dependencies: 'clang libclang-dev'
1 change: 1 addition & 0 deletions .github/workflows/release-please.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,3 +30,4 @@ jobs:
publish-to-crates-io: true # Enable publishing to crates.io
upgrade-dependencies: true # Upgrade cross-workspace dependencies
version-suffix: 'non-semver-compat' # Version suffix for the crates.io release
dependencies: 'clang libclang-dev' # Additional Linux dependencies to install
10 changes: 6 additions & 4 deletions core/Cargo.lock
View file
Open in desktop

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

4 changes: 1 addition & 3 deletions core/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,8 +242,7 @@ zk_evm_1_5_0 = { package = "zk_evm", version = "=0.150.20" }
fflonk = "=0.30.13"
bellman = {package = "zksync_bellman", version = "=0.30.13"}

# New VM; pinned to a specific commit because of instability
zksync_vm2 = { git = "https://github.com/matter-labs/vm2.git", rev = "457d8a7eea9093af9440662e33e598c13ba41633" }
zksync_vm2 = "=0.3.0"

# Consensus dependencies.
zksync_concurrency = "=0.8.0"
Expand Down Expand Up @@ -278,7 +277,6 @@ zksync_health_check = { version = "26.2.1-non-semver-compat", path = "lib/health
zksync_l1_contract_interface = { version = "26.2.1-non-semver-compat", path = "lib/l1_contract_interface" }
zksync_mempool = { version = "26.2.1-non-semver-compat", path = "lib/mempool" }
zksync_merkle_tree = { version = "26.2.1-non-semver-compat", path = "lib/merkle_tree" }
zksync_bin_metadata = { version = "=26.1.0-non-semver-compat", path = "lib/bin_metadata" }
zksync_mini_merkle_tree = { version = "26.2.1-non-semver-compat", path = "lib/mini_merkle_tree" }
zksync_object_store = { version = "26.2.1-non-semver-compat", path = "lib/object_store" }
zksync_protobuf_config = { version = "26.2.1-non-semver-compat", path = "lib/protobuf_config" }
Expand Down
1 change: 1 addition & 0 deletions core/lib/test_contracts/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ repository.workspace = true
license.workspace = true
keywords.workspace = true
categories.workspace = true
publish = false

[dependencies]
zksync_types.workspace = true
Expand Down
56 changes: 52 additions & 4 deletions prover/Cargo.lock
View file
Open in desktop

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

34 changes: 17 additions & 17 deletions prover/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,23 +81,23 @@ shivini = "=0.152.11"
boojum-cuda = "=0.152.11"

# Core workspace dependencies
zksync_multivm = { path = "../core/lib/multivm" }
zksync_vlog = { path = "../core/lib/vlog" }
zksync_basic_types = { path = "../core/lib/basic_types" }
zksync_config = { path = "../core/lib/config" }
zksync_dal = { path = "../core/lib/dal" }
zksync_db_connection = { path = "../core/lib/db_connection" }
zksync_env_config = { path = "../core/lib/env_config" }
zksync_object_store = { path = "../core/lib/object_store" }
zksync_prover_interface = { path = "../core/lib/prover_interface" }
zksync_queued_job_processor = { path = "../core/lib/queued_job_processor" }
zksync_system_constants = { path = "../core/lib/constants" }
zksync_types = { path = "../core/lib/types" }
zksync_utils = { path = "../core/lib/utils" }
zksync_eth_client = { path = "../core/lib/eth_client" }
zksync_contracts = { path = "../core/lib/contracts" }
zksync_core_leftovers = { path = "../core/lib/zksync_core_leftovers" }
zksync_protobuf_config = { path = "../core/lib/protobuf_config" }
zksync_multivm = "=26.2.1-non-semver-compat"
zksync_vlog = "=26.2.1-non-semver-compat"
zksync_basic_types = "=26.2.1-non-semver-compat"
zksync_config = "=26.2.1-non-semver-compat"
zksync_dal = "=26.2.1-non-semver-compat"
zksync_db_connection = "=26.2.1-non-semver-compat"
zksync_env_config = "=26.2.1-non-semver-compat"
zksync_object_store = "=26.2.1-non-semver-compat"
zksync_prover_interface = "=26.2.1-non-semver-compat"
zksync_queued_job_processor = "=26.2.1-non-semver-compat"
zksync_system_constants = "=26.2.1-non-semver-compat"
zksync_types = "=26.2.1-non-semver-compat"
zksync_utils = "=26.2.1-non-semver-compat"
zksync_eth_client = "=26.2.1-non-semver-compat"
zksync_contracts = "=26.2.1-non-semver-compat"
zksync_core_leftovers = "=26.2.1-non-semver-compat"
zksync_protobuf_config = "=26.2.1-non-semver-compat"

# Prover workspace dependencies
zksync_prover_dal = { version = "18.0.0", path = "crates/lib/prover_dal" }
Expand Down
Loading
Loading