diff --git a/.github/mergify.yml b/.github/mergify.yml index b53739f8..9606c27e 100644 --- a/.github/mergify.yml +++ b/.github/mergify.yml @@ -1,12 +1,23 @@ pull_request_rules: - - name: backport patches to v1.8.2-RAI + - name: backport patches to v1.8.2+RAI conditions: - base=master - - label=backport-v1.8.2-RAI + - label=backport-v1.8.2+RAI actions: backport: branches: - - v1.8.2-RAI + - v1.8.2+RAI + assignees: + - "{{ author }}" + label_conflicts: backport-conflicts + - name: backport patches to v1.9.2+RAI + conditions: + - base=master + - label=backport-v1.9.2+RAI + actions: + backport: + branches: + - v1.9.2+RAI assignees: - "{{ author }}" label_conflicts: backport-conflicts diff --git a/.github/scripts/common.sh b/.github/scripts/common.sh index 13ef3cf5..1688a044 100644 --- a/.github/scripts/common.sh +++ b/.github/scripts/common.sh @@ -10,8 +10,9 @@ export MMTK_JULIA_DIR=$BINDING_PATH # Make sure we have enough heap to build Julia export MMTK_MIN_HSIZE_G=0.5 export MMTK_MAX_HSIZE_G=4 -# Make sure we do not get OOM killed. The Github runner has ~7G RAM. -export JULIA_TEST_MAXRSS_MB=6500 +# Make sure we do not get OOM killed. +total_mem=$(free -m | awk '/^Mem:/ {print $2}') +export JULIA_TEST_MAXRSS_MB=$total_mem ci_run_jl_test() { test=$1 diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index cbd99f16..7f58cdb4 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -4,7 +4,8 @@ on: pull_request: branches: - master - - v1.8.2-RAI + - v1.8.2+RAI + - v1.9.2+RAI concurrency: # Cancels pending runs when a PR gets updated.