Skip to content

Commit 77cb350

Browse files
committed
Adding CI support
1 parent 97bace5 commit 77cb350

File tree

3 files changed

+12
-7
lines changed

3 files changed

+12
-7
lines changed

.github/scripts/ci-build.sh

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ fi
1212
build_type=$1
1313
# plan to use
1414
plan=$2
15-
# moving vs non-moving
15+
# max-moving vs non-moving
1616
is_moving=$3
1717

1818
# helloworld.jl
@@ -27,10 +27,14 @@ fi
2727
plan_feature=${plan,,}
2828
moving_feature=${is_moving,,}
2929

30-
if [ "$is_moving" == "moving" ]; then
30+
if [ "$moving_feature" == "max_moving" ]; then
3131
MOVING=1
32+
ALWAYS_MOVING=1
33+
MAX_MOVING=1
3234
else
3335
MOVING=0
36+
ALWAYS_MOVING=0
37+
MAX_MOVING=0
3438
fi
3539

3640
cd $JULIA_PATH
@@ -39,6 +43,6 @@ make cleanall
3943
# This will build the binding in MMTK_JULIA_DIR (defined in common.sh), and link it
4044
# when building Julia, instead of using the set version defined in Julia itself
4145
cp $BINDING_PATH/.github/scripts/Make.user $JULIA_PATH/
42-
MMTK_MOVING=$MOVING MMTK_PLAN=$plan MMTK_BUILD=$build_type make
46+
MMTK_MOVING=$MOVING MMTK_ALWAYS_MOVING=$ALWAYS_MOVING MMTK_MAX_MOVING=$MAX_MOVING MMTK_PLAN=$plan MMTK_BUILD=$build_type make
4347
# Run hello world
4448
$JULIA_PATH/julia $HELLO_WORLD_JL

.github/workflows/ci.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ on:
77
- v1.8.2\+RAI
88
- v1.9.2\+RAI
99
- dev
10+
- mmtk-support-moving-upstream
1011

1112
concurrency:
1213
# Cancels pending runs when a PR gets updated.
@@ -17,8 +18,8 @@ jobs:
1718
julia-version:
1819
runs-on: ubuntu-latest
1920
env:
20-
JULIA_REPO_DEFAULT: JuliaLang/julia
21-
JULIA_REF_DEFAULT: master
21+
JULIA_REPO_DEFAULT: mmtk/julia
22+
JULIA_REF_DEFAULT: mmtk-support-moving-upstream
2223
outputs:
2324
julia_repo: ${{ steps.print.outputs.julia_repo }}
2425
julia_ref: ${{ steps.print.outputs.julia_ref }}
@@ -40,7 +41,7 @@ jobs:
4041
fail-fast: false
4142
matrix:
4243
gc_plan: [Immix]
43-
moving: [Non_Moving, Moving]
44+
moving: [Non_Moving, Max_Moving]
4445
uses: ./.github/workflows/binding-tests.yml
4546
with:
4647
gc_plan: ${{ matrix.gc_plan }}

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ release:
6161
@cd $(MMTK_JULIA_DIR)mmtk && $(PROJECT_DIRS) cargo build --features $(CARGO_FEATURES) --release
6262

6363
debug:
64-
@echo "Building the Rust project in $(MMTK_JULIA_DIR) using a debug build";
64+
@echo "Building the Rust project in $(MMTK_JULIA_DIR)mmtk using a debug build with MMTK_VARS: $(MMTK_VARS)";
6565
@cd $(MMTK_JULIA_DIR)mmtk && $(PROJECT_DIRS) cargo build --features $(CARGO_FEATURES)
6666

6767
# Build the Julia project (which will build the binding as part of their deps build)

0 commit comments

Comments
 (0)