Skip to content

Commit

Permalink
Move to Rust 1.83 (#211)
Browse files Browse the repository at this point in the history
This PR updates the pinned Rust version to 1.83, and updates mmtk-core
to mmtk/mmtk-core#1253.
  • Loading branch information
qinsoon authored Jan 6, 2025
1 parent e2eeef0 commit 73e9c84
Show file tree
Hide file tree
Showing 4 changed files with 39 additions and 5 deletions.
34 changes: 34 additions & 0 deletions .github/mergify.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
pull_request_rules:
- name: backport patches to v1.8.2+RAI
conditions:
- base=master
- label=backport-v1.8.2+RAI
actions:
backport:
branches:
- v1.8.2+RAI
assignees:
- "{{ author }}"
label_conflicts: backport-conflicts
- name: backport patches to v1.9.2+RAI
conditions:
- base=master
- label=backport-v1.9.2+RAI
actions:
backport:
branches:
- v1.9.2+RAI
assignees:
- "{{ author }}"
label_conflicts: backport-conflicts
- name: backport patches to dev
conditions:
- base=master
- label=backport-dev
actions:
backport:
branches:
- dev
assignees:
- "{{ author }}"
label_conflicts: backport-conflicts
6 changes: 3 additions & 3 deletions mmtk/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion mmtk/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ lazy_static = "1.1"
# - change branch
# - change repo name
# But other changes including adding/removing whitespaces in commented lines may break the CI
mmtk = { git = "https://github.com/mmtk/mmtk-core.git", rev = "c0f97884234b51b13c8ba5d1563a8e0f592d11c2" }
mmtk = { git = "https://github.com/mmtk/mmtk-core.git", rev = "ec745353a8de72b645613e0fef3ab7f5f1ad9bd1" }
# Uncomment the following to build locally
# mmtk = { path = "../repos/mmtk-core" }
log = {version = "0.4", features = ["max_level_trace", "release_max_level_off"] }
Expand Down
2 changes: 1 addition & 1 deletion mmtk/rust-toolchain
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.77.0
1.83.0

0 comments on commit 73e9c84

Please sign in to comment.