Skip to content

Commit 9b59bb5

Browse files
authored
Adding print versioninfo and cleaning up build script for CI (#218)
1 parent f07d66a commit 9b59bb5

File tree

2 files changed

+23
-7
lines changed

2 files changed

+23
-7
lines changed

.github/scripts/ci-build.sh

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,12 @@ else
3333
MOVING=0
3434
fi
3535

36-
cd $MMTK_JULIA_DIR
37-
38-
MMTK_MOVING=$MOVING make $build_type
39-
4036
cd $JULIA_PATH
41-
4237
# Clean first
4338
make cleanall
44-
# Build
39+
# This will build the binding in MMTK_JULIA_DIR (defined in common.sh), and link it
40+
# when building Julia, instead of using the set version defined in Julia itself
4541
cp $BINDING_PATH/.github/scripts/Make.user $JULIA_PATH/
46-
MMTK_PLAN=$plan MMTK_BUILD=$build_type make
42+
MMTK_MOVING=$MOVING MMTK_PLAN=$plan MMTK_BUILD=$build_type make
4743
# Run hello world
4844
$JULIA_PATH/julia $HELLO_WORLD_JL

.github/workflows/binding-tests.yml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@ jobs:
3131
- name: Build Julia (Debug)
3232
run: |
3333
./.github/scripts/ci-build.sh debug ${{ inputs.gc_plan }} ${{ inputs.moving }}
34+
- name: Print Julia version info
35+
run: |
36+
JULIA_PATH=$(realpath $(dirname "$0"))/../mmtk-julia/mmtk-julia/vm/julia
37+
$JULIA_PATH/julia --project=. -e "using InteractiveUtils; versioninfo()"
3438
- name: Style check
3539
run: |
3640
./.github/scripts/ci-style.sh
@@ -52,6 +56,10 @@ jobs:
5256
- name: Build Julia (Debug)
5357
run: |
5458
./.github/scripts/ci-build.sh debug ${{ inputs.gc_plan }} ${{ inputs.moving }}
59+
- name: Print Julia version info
60+
run: |
61+
JULIA_PATH=$(realpath $(dirname "$0"))/../mmtk-julia/mmtk-julia/vm/julia
62+
$JULIA_PATH/julia --project=. -e "using InteractiveUtils; versioninfo()"
5563
- name: Style check
5664
run: |
5765
./.github/scripts/ci-style.sh
@@ -95,6 +103,10 @@ jobs:
95103
- name: Build Julia (Release)
96104
run: |
97105
./.github/scripts/ci-build.sh release ${{ inputs.gc_plan }} ${{ inputs.moving }}
106+
- name: Print Julia version info
107+
run: |
108+
JULIA_PATH=$(realpath $(dirname "$0"))/../mmtk-julia/mmtk-julia/vm/julia
109+
$JULIA_PATH/julia --project=. -e "using InteractiveUtils; versioninfo()"
98110
- name: Test Julia
99111
run: |
100112
./.github/scripts/ci-test-other.sh
@@ -117,6 +129,10 @@ jobs:
117129
- name: Build Julia (Release)
118130
run: |
119131
./.github/scripts/ci-build.sh release ${{ inputs.gc_plan }} ${{ inputs.moving }}
132+
- name: Print Julia version info
133+
run: |
134+
JULIA_PATH=$(realpath $(dirname "$0"))/../mmtk-julia/mmtk-julia/vm/julia
135+
$JULIA_PATH/julia --project=. -e "using InteractiveUtils; versioninfo()"
120136
- name: Test Julia
121137
run: |
122138
./.github/scripts/ci-test-stdlib.sh
@@ -136,6 +152,10 @@ jobs:
136152
- name: Build Julia (Release)
137153
run: |
138154
./.github/scripts/ci-build.sh release ${{ inputs.gc_plan }} ${{ inputs.moving }}
155+
- name: Print Julia version info
156+
run: |
157+
JULIA_PATH=$(realpath $(dirname "$0"))/../mmtk-julia/mmtk-julia/vm/julia
158+
$JULIA_PATH/julia --project=. -e "using InteractiveUtils; versioninfo()"
139159
- name: Test Julia
140160
run: |
141161
./.github/scripts/ci-test-LinearAlgebra.sh

0 commit comments

Comments
 (0)