diff --git a/.github/mergify.yml b/.github/mergify.yml new file mode 100644 index 00000000..67bc7897 --- /dev/null +++ b/.github/mergify.yml @@ -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 diff --git a/mmtk/Cargo.lock b/mmtk/Cargo.lock index a54b8f49..0eda96c0 100644 --- a/mmtk/Cargo.lock +++ b/mmtk/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "aho-corasick" @@ -573,7 +573,7 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "mmtk" version = "0.30.0" -source = "git+https://github.com/qinsoon/mmtk-core.git?rev=7ce3d8a0c26d64b535c5a1b9ffd4c70037351fac#7ce3d8a0c26d64b535c5a1b9ffd4c70037351fac" +source = "git+https://github.com/mmtk/mmtk-core.git?rev=ec745353a8de72b645613e0fef3ab7f5f1ad9bd1#ec745353a8de72b645613e0fef3ab7f5f1ad9bd1" dependencies = [ "atomic 0.6.0", "atomic-traits", @@ -627,7 +627,7 @@ dependencies = [ [[package]] name = "mmtk-macros" version = "0.30.0" -source = "git+https://github.com/qinsoon/mmtk-core.git?rev=7ce3d8a0c26d64b535c5a1b9ffd4c70037351fac#7ce3d8a0c26d64b535c5a1b9ffd4c70037351fac" +source = "git+https://github.com/mmtk/mmtk-core.git?rev=ec745353a8de72b645613e0fef3ab7f5f1ad9bd1#ec745353a8de72b645613e0fef3ab7f5f1ad9bd1" dependencies = [ "proc-macro-error", "proc-macro2", diff --git a/mmtk/Cargo.toml b/mmtk/Cargo.toml index 4ef7b86a..828e63e6 100644 --- a/mmtk/Cargo.toml +++ b/mmtk/Cargo.toml @@ -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"] } diff --git a/mmtk/rust-toolchain b/mmtk/rust-toolchain index ef8b0923..6b4de0a4 100644 --- a/mmtk/rust-toolchain +++ b/mmtk/rust-toolchain @@ -1 +1 @@ -1.77.0 \ No newline at end of file +1.83.0