Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions .github/scripts/ci-btest.sh
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ cd $RUBY_BUILD_PATH

echo "============ Bootstrape tests (btest) ($DEBUG_LEVEL) ============="
if test "$DEBUG_LEVEL" == "vanilla"; then
make btest TESTOPTS="-v -j${CI_JOBS}"
make btest TESTOPTS="-v -j${CI_JOBS} ${YJIT_OPTS}"
else
# Some test cases take too much time to run in debug mode, resulting in timeout. It is
# because the default GC trigger (dynamic heap size) does not scale the heap size fast
Expand All @@ -26,5 +26,5 @@ else
test_and_delete thread 400m

# Run other btests in the regular way.
make btest RUN_OPTS="--mmtk-plan=$CHOSEN_PLAN" TESTOPTS="-v -j${CI_JOBS}"
make btest RUN_OPTS="--mmtk-plan=$CHOSEN_PLAN" TESTOPTS="-v -j${CI_JOBS} ${YJIT_OPTS}"
fi
2 changes: 1 addition & 1 deletion .github/scripts/ci-test-all.sh
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ case $DEBUG_LEVEL in
;;
release)
make test-all \
RUN_OPTS="--mmtk-plan=$CHOSEN_PLAN" \
RUN_OPTS="--mmtk-plan=$CHOSEN_PLAN ${YJIT_OPTS}" \
TESTOPTS="-v --excludes-dir=../test/.excludes-mmtk -j${CI_JOBS}"
;;
vanilla)
Expand Down
5 changes: 5 additions & 0 deletions .github/scripts/common.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,8 @@ CI_JOBS=4
if test -z "$CHOSEN_PLAN"; then
CHOSEN_PLAN=$DEFAULT_PLAN
fi

YJIT_OPTS=" "
if test "$USE_YJIT" == "yes"; then
YJIT_OPTS=" --yjit"
fi
13 changes: 12 additions & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,24 @@ jobs:
strategy:
fail-fast: true
matrix:
special: ["normal"]
debug-level: ["debug", "release"]
plan: ["MarkSweep", "Immix", "StickyImmix"]
include:
- debug-level: vanilla
- special: "special"
debug-level: "vanilla"
- special: "special"
debug-level: "debug"
plan: "StickyImmix"
yjit: "yjit"
- special: "special"
debug-level: "release"
plan: "StickyImmix"
yjit: "yjit"
env:
DEBUG_LEVEL: ${{ matrix.debug-level }}
CHOSEN_PLAN: ${{ matrix.plan }}
USE_YJIT: ${{ matrix.yjit }}
steps:
- name: Checkout MMTk Ruby binding
uses: actions/checkout@v4
Expand Down
2 changes: 1 addition & 1 deletion mmtk/Cargo.toml
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 = "e3be189efb1ddd31949519d9a7201abd7a62a0f2"
rev = "64c07dcd7ca763e25607848df3be909135e02589"

[lib]
name = "mmtk_ruby"
Expand Down