diff --git a/.github/scripts/ci-build.sh b/.github/scripts/ci-build.sh index b12d79f1..3c4028b3 100755 --- a/.github/scripts/ci-build.sh +++ b/.github/scripts/ci-build.sh @@ -33,16 +33,12 @@ else MOVING=0 fi -cd $MMTK_JULIA_DIR - -MMTK_MOVING=$MOVING make $build_type - cd $JULIA_PATH - # Clean first make cleanall -# Build +# This will build the binding in MMTK_JULIA_DIR (defined in common.sh), and link it +# when building Julia, instead of using the set version defined in Julia itself cp $BINDING_PATH/.github/scripts/Make.user $JULIA_PATH/ -MMTK_PLAN=$plan MMTK_BUILD=$build_type make +MMTK_MOVING=$MOVING MMTK_PLAN=$plan MMTK_BUILD=$build_type make # Run hello world $JULIA_PATH/julia $HELLO_WORLD_JL diff --git a/.github/workflows/binding-tests.yml b/.github/workflows/binding-tests.yml index 3cd1ffa5..1f595fc3 100644 --- a/.github/workflows/binding-tests.yml +++ b/.github/workflows/binding-tests.yml @@ -31,6 +31,10 @@ jobs: - name: Build Julia (Debug) run: | ./.github/scripts/ci-build.sh debug ${{ inputs.gc_plan }} ${{ inputs.moving }} + - name: Print Julia version info + run: | + JULIA_PATH=$(realpath $(dirname "$0"))/../mmtk-julia/mmtk-julia/vm/julia + $JULIA_PATH/julia --project=. -e "using InteractiveUtils; versioninfo()" - name: Style check run: | ./.github/scripts/ci-style.sh @@ -52,6 +56,10 @@ jobs: - name: Build Julia (Debug) run: | ./.github/scripts/ci-build.sh debug ${{ inputs.gc_plan }} ${{ inputs.moving }} + - name: Print Julia version info + run: | + JULIA_PATH=$(realpath $(dirname "$0"))/../mmtk-julia/mmtk-julia/vm/julia + $JULIA_PATH/julia --project=. -e "using InteractiveUtils; versioninfo()" - name: Style check run: | ./.github/scripts/ci-style.sh @@ -95,6 +103,10 @@ jobs: - name: Build Julia (Release) run: | ./.github/scripts/ci-build.sh release ${{ inputs.gc_plan }} ${{ inputs.moving }} + - name: Print Julia version info + run: | + JULIA_PATH=$(realpath $(dirname "$0"))/../mmtk-julia/mmtk-julia/vm/julia + $JULIA_PATH/julia --project=. -e "using InteractiveUtils; versioninfo()" - name: Test Julia run: | ./.github/scripts/ci-test-other.sh @@ -117,6 +129,10 @@ jobs: - name: Build Julia (Release) run: | ./.github/scripts/ci-build.sh release ${{ inputs.gc_plan }} ${{ inputs.moving }} + - name: Print Julia version info + run: | + JULIA_PATH=$(realpath $(dirname "$0"))/../mmtk-julia/mmtk-julia/vm/julia + $JULIA_PATH/julia --project=. -e "using InteractiveUtils; versioninfo()" - name: Test Julia run: | ./.github/scripts/ci-test-stdlib.sh @@ -136,6 +152,10 @@ jobs: - name: Build Julia (Release) run: | ./.github/scripts/ci-build.sh release ${{ inputs.gc_plan }} ${{ inputs.moving }} + - name: Print Julia version info + run: | + JULIA_PATH=$(realpath $(dirname "$0"))/../mmtk-julia/mmtk-julia/vm/julia + $JULIA_PATH/julia --project=. -e "using InteractiveUtils; versioninfo()" - name: Test Julia run: | ./.github/scripts/ci-test-LinearAlgebra.sh