Skip to content
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
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ apollo_reverts.path = "crates/apollo_reverts"
apollo_rpc.path = "crates/apollo_rpc"
apollo_rpc_execution.path = "crates/apollo_rpc_execution"
apollo_starknet_client.path = "crates/apollo_starknet_client"
apollo_starknet_os_program.path = "crates/apollo_starknet_os_program"
apollo_starknet_os_program = { path = "crates/apollo_starknet_os_program", version = "0.15.0-rc.0" }
apollo_state_reader.path = "crates/apollo_state_reader"
apollo_state_sync.path = "crates/apollo_state_sync"
apollo_state_sync_metrics.path = "crates/apollo_state_sync_metrics"
Expand Down
8 changes: 4 additions & 4 deletions workspace_tests/version_integrity_test.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,11 @@ use toml_test_utils::{
};

const PARENT_BRANCH: &str = include_str!("../scripts/parent_branch.txt");
const MAIN_PARENT_BRANCH: &str = "main";
const MAIN_BRANCH: &str = "main";
const EXPECTED_MAIN_VERSION: &str = "0.0.0";

static ROOT_CRATES_FOR_PUBLISH: LazyLock<HashSet<&str>> =
LazyLock::new(|| HashSet::from(["blockifier"]));
LazyLock::new(|| HashSet::from(["blockifier", "apollo_starknet_os_program"]));
static CRATES_FOR_PUBLISH: LazyLock<HashSet<String>> = LazyLock::new(|| {
let publish_deps: HashSet<String> = ROOT_CRATES_FOR_PUBLISH
.iter()
Expand Down Expand Up @@ -224,12 +224,12 @@ fn test_no_features_in_workspace() {

#[test]
fn test_main_branch_is_versionless() {
if PARENT_BRANCH.trim() == MAIN_PARENT_BRANCH {
if PARENT_BRANCH.trim() == MAIN_BRANCH {
let workspace_version = ROOT_TOML.workspace_version();
assert_eq!(
workspace_version, EXPECTED_MAIN_VERSION,
"The workspace version should be '{EXPECTED_MAIN_VERSION}' when the parent branch is \
'{MAIN_PARENT_BRANCH}'; found {workspace_version}.",
'{MAIN_BRANCH}'; found {workspace_version}.",
);
}
}
Loading