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

Fix schema generation. #76

Merged
merged 2 commits into from
Feb 6, 2024
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
8 changes: 4 additions & 4 deletions .github/workflows/ci-cargo-odra.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
- run: just prepare
- run: just check-lint
- run: just install
- run: just test-project-generation-on-future-odra
- run: just test-workspace-generation-on-future-odra
# - run: just test-project-generation-on-stable-odra
# - run: just test-workspace-generation-on-stable-odra
# - run: just test-project-generation-on-future-odra
# - run: just test-workspace-generation-on-future-odra
- run: just test-project-generation-on-stable-odra
- run: just test-workspace-generation-on-stable-odra
3 changes: 2 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/target
.idea
testproject
Cargo.lock
.*
!/.gitignore
5 changes: 1 addition & 4 deletions src/actions/init.rs
Original file line number Diff line number Diff line change
Expand Up @@ -162,10 +162,7 @@ impl InitAction {
// version
let version_regex = regex::Regex::new(r"^\d+\.\d+\.\d+$").unwrap();
if version_regex.is_match(&source) {
OdraLocation::Remote(
ODRA_TEMPLATE_GH_REPO.to_string(),
Some(format!("release/{}", source)),
)
OdraLocation::CratesIO(source)
} else {
// branch
OdraLocation::Remote(ODRA_TEMPLATE_GH_REPO.to_string(), Some(source))
Expand Down
2 changes: 1 addition & 1 deletion src/actions/schema.rs
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ impl SchemaAction<'_> {
command::cargo_generate_schema_files(
self.project.project_root(),
&contract.struct_name(),
&contract.module_name(),
&contract.crate_name(self.project),
);
}
}
Expand Down
Loading