Skip to content

Commit 5918de4

Browse files
authored
Updating dev (#186)
Backporting #180, merge with mmtk/julia#67.
1 parent 7c4f844 commit 5918de4

22 files changed

+362
-5759
lines changed

.github/scripts/ci-test-LinearAlgebra.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ set -e
55

66
. $(dirname "$0")/common.sh
77

8-
export MMTK_MAX_HSIZE_G=7.5
8+
export MMTK_MAX_HSIZE_G=8
99
total_mem=$(free -m | awk '/^Mem:/ {print $2}')
1010
mem_threshold=512 # use 0.5Gb as a threshold for the max rss based on the total free memory
1111
total_mem_restricted=$((total_mem- mem_threshold))

.github/scripts/common.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
BINDING_PATH=$(realpath $(dirname "$0"))/../..
2-
JULIA_PATH=$BINDING_PATH/vm/julia
2+
export JULIA_PATH=$BINDING_PATH/vm/julia
33

44
RUSTUP_TOOLCHAIN=`cat $BINDING_PATH/mmtk/rust-toolchain`
55
JULIA_TEST_ARGS='--check-bounds=yes --startup-file=no --depwarn=error'

.github/workflows/binding-tests.yml

+12
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ jobs:
1919
run: |
2020
./.github/scripts/ci-checkout.sh
2121
./.github/scripts/ci-setup.sh
22+
# removing these as they cause a conflict within bindgen
23+
sudo rm -rf /usr/lib/llvm-14
24+
sudo rm -rf /usr/lib/llvm-13
2225
- name: Build Julia (Debug)
2326
run: |
2427
./.github/scripts/ci-build.sh debug ${{ inputs.gc_plan }} ${{ inputs.moving }}
@@ -35,6 +38,9 @@ jobs:
3538
run: |
3639
./.github/scripts/ci-checkout.sh
3740
./.github/scripts/ci-setup.sh
41+
# removing these as they cause a conflict within bindgen
42+
sudo rm -rf /usr/lib/llvm-14
43+
sudo rm -rf /usr/lib/llvm-13
3844
- name: Patching unsupported tests
3945
run: |
4046
./.github/scripts/ci-test-patching.sh
@@ -54,6 +60,9 @@ jobs:
5460
run: |
5561
./.github/scripts/ci-checkout.sh
5662
./.github/scripts/ci-setup.sh
63+
# removing these as they cause a conflict within bindgen
64+
sudo rm -rf /usr/lib/llvm-14
65+
sudo rm -rf /usr/lib/llvm-13
5766
- name: Patching unsupported tests
5867
run: |
5968
./.github/scripts/ci-test-patching.sh
@@ -73,6 +82,9 @@ jobs:
7382
run: |
7483
./.github/scripts/ci-checkout.sh
7584
./.github/scripts/ci-setup.sh
85+
# removing these as they cause a conflict within bindgen
86+
sudo rm -rf /usr/lib/llvm-14
87+
sudo rm -rf /usr/lib/llvm-13
7688
- name: Build Julia (Release)
7789
run: |
7890
./.github/scripts/ci-build.sh release ${{ inputs.gc_plan }} ${{ inputs.moving }}

.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,4 @@ jobs:
2323
uses: ./.github/workflows/binding-tests.yml
2424
with:
2525
gc_plan: ${{ matrix.gc_plan }}
26-
moving: ${{ matrix.moving }}
26+
moving: ${{ matrix.moving }}

0 commit comments

Comments
 (0)