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.

Sign up for GitHub

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

Update mmtk and ruby repo and add CI test #56

Merged
merged 1 commit into from
Mar 28, 2024
Merged

Update mmtk and ruby repo and add CI test #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/scripts/ci-btest.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ export RUST_BACKTRACE=1
cd $RUBY_BUILD_PATH

echo "============ Bootstrape tests (btest) ($DEBUG_LEVEL) ============="
make btest RUN_OPTS="--mmtk-plan=Immix" TESTOPTS="-v"
make btest RUN_OPTS="--mmtk-plan=$CHOSEN_PLAN" TESTOPTS="-v"
2 changes: 1 addition & 1 deletion .github/scripts/ci-test-all.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ case $DEBUG_LEVEL in
;;
release)
TEST_CASES=$(cat $BINDING_PATH/ruby-test-cases.txt | grep -v '#' | ruby -ne 'puts "../#{$_}"' | xargs)
make test-all TESTS="$TEST_CASES" RUN_OPTS="--mmtk-plan=Immix" TESTOPTS="-v"
make test-all TESTS="$TEST_CASES" RUN_OPTS="--mmtk-plan=$CHOSEN_PLAN" TESTOPTS="-v"
;;
*)
echo "Unexpected debug level: $DEBUG_LEVEL"
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
fail-fast: true
steps:
- name: Checkout MMTk Ruby binding
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
path: ./git/mmtk-ruby
- name: Setup environment
Expand All @@ -34,8 +34,10 @@ jobs:
fail-fast: true
matrix:
debug-level: ["debug", "release"]
plan: ["MarkSweep", "Immix"]
env:
DEBUG_LEVEL: ${{ matrix.debug-level }}
CHOSEN_PLAN: ${{ matrix.plan }}
steps:
- name: Checkout MMTk Ruby binding
uses: actions/checkout@v4
Expand Down
58 changes: 29 additions & 29 deletions mmtk/Cargo.lock
View file
Open in desktop

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

4 changes: 2 additions & 2 deletions mmtk/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ edition = "2021"
# Metadata for the Ruby repository
[package.metadata.ci-repos.ruby]
repo = "mmtk/ruby" # This is used by actions/checkout, so the format is "owner/repo", not URL.
rev = "ff16207cfbe2e54997e2111022185d1591605179"
rev = "6d1596f7a4401d267d2b208c42521edc35020a8e "

[lib]
name = "mmtk_ruby"
Expand All @@ -37,7 +37,7 @@ features = ["is_mmtk_object", "object_pinning"]

# Uncomment the following lines to use mmtk-core from the official repository.
git = "https://github.com/mmtk/mmtk-core.git"
rev = "86a94ca502594d078b35c29ea3d1d68b34f16a28"
rev = "dd84218933deab50196fc77828cc1446cb829881"

# Uncomment the following line to use mmtk-core from a local repository.
#path = "../../mmtk-core"
Expand Down