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 CI #261

Merged
merged 3 commits into from
Jun 27, 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
4 changes: 4 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,10 @@ jobs:
profile: minimal
toolchain: nightly
override: true
- uses: arduino/setup-protoc@v1
with:
version: '3.x'
repo-token: ${{ secrets.GITHUB_TOKEN }}
- uses: actions-rs/cargo@v1
with:
command: clean
Expand Down
2 changes: 1 addition & 1 deletion build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ mod tonic {
.map_err(|e| format!("protobuf compilation error: {:?}", e))?;

// Generate documentation for the protobuf abi
generate_doc(&protos).map_err(|e| format!("protobuf documentation error: {:?}", e))?;
// generate_doc(&protos).map_err(|e| format!("protobuf documentation error: {:?}", e))?;

// Return Ok if the build and documentation generation were successful
Ok(())
Expand Down
5 changes: 3 additions & 2 deletions src/as_execution/env.rs
Original file line number Diff line number Diff line change
Expand Up @@ -92,8 +92,9 @@ pub(crate) fn get_remaining_points(
} else {
match env.get_exhausted_points().as_ref() {
Some(exhausted_points) => match exhausted_points.get(store).try_into() {
Ok::<u64, _>(exhausted) if exhausted > 0 => return Ok(0),
Ok::<u64, _>(_) => (),
// Using i32 here because it's the type used internally by wasmer for exhausted.
bilboquet marked this conversation as resolved.
Show resolved Hide resolved
Ok::<i32, _>(exhausted) if exhausted > 0 => return Ok(0),
Ok::<i32, _>(_) => (),
Err(_) => abi_bail!("exhausted_points has wrong type"),
},
None => abi_bail!("Lost reference to exhausted_points"),
Expand Down
Loading