Skip to content

Ensure that Cargo.lock in the repo is valid#93

Closed
matklad wants to merge 9 commits intoaurora-is-near:masterfrom
matklad:lock-the-lock
Closed

Ensure that Cargo.lock in the repo is valid#93
matklad wants to merge 9 commits intoaurora-is-near:masterfrom
matklad:lock-the-lock

Conversation

@matklad
Copy link
Copy Markdown
Contributor

@matklad matklad commented May 18, 2021

At the moment, running cargo check locally for me:

  • fails with some compilation error in the dependency
  • updates Cargo.lock

That is, the Cargo.lock that is committed into the repo doesn't work. To
prevent this from happening in the future, let's forbid CI from
upgrading Cargo.lock.

mfornet and others added 3 commits May 13, 2021 00:22
* Base precompile code between connectors

* Handle errors and validate input

* Use proper result
@matklad matklad requested a review from artob as a code owner May 18, 2021 09:44
@matklad
Copy link
Copy Markdown
Contributor Author

matklad commented May 18, 2021

This is more of an issue, rather than a pull-request -- to merge this, a working Cargo.lock needs to be supplied, and I won't be looking into fixing that.

Copy link
Copy Markdown
Member

@birchmd birchmd left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

cargo check works for me. I'm not sure how Cargo.lock could have been corrupted since it is always autogenerated. That said, I don't see the harm in adding --locked.

@matklad
Copy link
Copy Markdown
Contributor Author

matklad commented May 18, 2021

could have been corrupted

It is not corrupted, it just doesn't match Cargo.toml. So, running cargo check or similar re-generates the lockfile, and it might pick new crate versions, if some were published in the meantime.

I attributed local cargo check failure to this non-reproducibility, but, if it works for you, it might be something else, like a difference in compiler version 🤔

birchmd added 3 commits May 19, 2021 01:33
* Validate register length in `read_input_arr20()`
* Only read register length in `Engine::get_code_size`
* Add `read_input_borsh()`
* Ensure `method.args.len() == args_decoded.len()`
* Ensure register size is 8 in `read_u64`
* Use constant to specify the register ID used in `read_input()`
@artob artob requested a review from joshuajbouw May 18, 2021 22:52
Copy link
Copy Markdown
Contributor

@joshuajbouw joshuajbouw left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks fine to me.

@artob
Copy link
Copy Markdown
Contributor

artob commented May 20, 2021

@matklad @joshuajbouw Please retarget this at the develop branch, as per the README:
https://github.com/aurora-is-near/aurora-engine#branches

At the moment, running `cargo check` locally for me:

* fails with some compilation error in the dependency
* updates Cargo.lock

That is, the Cargo.lock that is committed into the repo doesn't work. To
prevent this from happening in the future, let's forbid CI from
upgrading Cargo.lock.
@matklad matklad closed this May 20, 2021
@artob artob added C-bug Category: Something isn't working. A-ci Area: Continuous Integration (CI) labels May 20, 2021
@artob artob self-assigned this May 20, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-ci Area: Continuous Integration (CI) C-bug Category: Something isn't working.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants