Skip to content

Commit feb5471

Browse files
authored
Use cargo generate-lockfile to update JikesRVM's Cargo.lock (#996)
`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
1 parent b4f4519 commit feb5471

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

.github/workflows/auto-merge.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,11 @@ jobs:
5050
base_repo: mmtk/mmtk-jikesrvm
5151
ref: ${{ needs.binding-refs.outputs.jikesrvm_binding_ref }}
5252
core_commit: ${{ needs.get-merged-pr.outputs.commit }}
53-
update_lockfile: cargo build --features nogc --target i686-unknown-linux-gnu
53+
# `cargo generate-lockfile` will update other dependencies. We avoid using it for the bindings.
54+
# But we do not have a good option for JikesRVM. The Rust project in JikesRVM needs some source files
55+
# that are generated during its build process. Unless we want to do a full build for JikesRVM, we cannot
56+
# use `cargo build`. So use `cargo generate-lockfile` instead.
57+
update_lockfile: cargo generate-lockfile
5458
secrets: inherit
5559

5660
check-merge-v8-pr:

0 commit comments

Comments
 (0)