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

Use cargo generate-lockfile to update JikesRVM's Cargo.lock #996

Merged
merged 5 commits into from
Oct 25, 2023

Conversation

qinsoon
Copy link
Member

@qinsoon qinsoon commented Oct 24, 2023

auto-merge.yml uses cargo build to generate lockfile for most bindings. But this does not work for JikesRVM:

  1. JikesRVM uses --target i686-unknown-linux-gnu which is not installed automatically when running cargo build.
  2. JikesRVM's cargo project uses some Rust source files that are generated during building JikesRVM. So we cannot build the cargo project alone from a fresh repo clone. We have to do a full build.

As a workaround, we use cargo generate-lockfile for JikesRVM. cargo generate-lockfile will update the version of dependencies. But we do not have a better option for JikesRVM

@qinsoon qinsoon changed the title Run ci-setup.sh before building Rust Use cargo generate-lockfile to update JikesRVM's Cargo.lock Oct 24, 2023
@qinsoon
Copy link
Member Author

qinsoon commented Oct 24, 2023

The previous auto-merge.yml failed for JikesRVM: https://github.com/mmtk/mmtk-core/actions/runs/6621479194/job/17985509918

@qinsoon qinsoon requested a review from wks October 24, 2023 04:43
Copy link
Collaborator

@wks wks left a comment

Choose a reason for hiding this comment

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

LGTM

@qinsoon qinsoon added this pull request to the merge queue Oct 25, 2023
Merged via the queue into master with commit feb5471 Oct 25, 2023
19 checks passed
@qinsoon qinsoon deleted the fix-jikesrvm-auto-merge branch October 25, 2023 05:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants