diff --git a/.github/scripts/ci-build.sh b/.github/scripts/ci-build.sh index 8e23f7c9..a6aa9d01 100755 --- a/.github/scripts/ci-build.sh +++ b/.github/scripts/ci-build.sh @@ -26,6 +26,11 @@ fi plan_feature=${plan,,} moving_feature=${is_moving,,} +if [ "$is_moving" == "Default" ]; then + tpin_roots=1 +else + tpin_roots=0 +fi cd $MMTK_JULIA_DIR/mmtk cargo build --features $plan_feature,$moving_feature $build_args @@ -36,6 +41,6 @@ cd $JULIA_PATH make cleanall # Build cp $BINDING_PATH/.github/scripts/Make.user $JULIA_PATH/ -MMTK_PLAN=$plan MMTK_BUILD=$build_type make +MMTK_PLAN=$plan MMTK_BUILD=$build_type MMTK_TPIN_ROOTS=$tpin_roots make # Run hello world $JULIA_PATH/julia $HELLO_WORLD_JL diff --git a/mmtk/Cargo.toml b/mmtk/Cargo.toml index fc82be5b..22a6a8e2 100644 --- a/mmtk/Cargo.toml +++ b/mmtk/Cargo.toml @@ -10,7 +10,7 @@ edition = "2018" [package.metadata.julia] # Our CI matches the following line and extract mmtk/julia. If this line is updated, please check ci yaml files and make sure it works. julia_repo = "https://github.com/mmtk/julia.git" -julia_version = "045bf87050653aa4ae996d3cdc052b1f3fcad7e6" +julia_version = "7bc3b32a687170322772e18fab347c3bcc260160" [lib] crate-type = ["cdylib"]