From b4305464f55b577448ff7e8bce9bcc65ffcb3083 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Manuel=20Dom=C3=ADnguez?= Date: Wed, 20 Sep 2023 09:38:41 +0200 Subject: [PATCH] trinity: Remove `-XX:MaxPermSize=2G` from `_JAVA_OPTIONS` Version 2.15.1 of Trinity no longer accepts the deprecated Java option `-XX:MaxPermSize`. For more information, see issues https://github.com/galaxyproject/usegalaxy-tools/issues/630 and https://github.com/usegalaxy-eu/issues/issues/473 --- files/galaxy/tpv/tools.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/files/galaxy/tpv/tools.yml b/files/galaxy/tpv/tools.yml index f9657f5e0..4863362b9 100644 --- a/files/galaxy/tpv/tools.yml +++ b/files/galaxy/tpv/tools.yml @@ -736,6 +736,10 @@ tools: env: _JAVA_OPTIONS: -XX:MaxPermSize=2G -Xmx{int(mem)}G -Xms1G -Djava.io.tmpdir=/data/2/galaxy_db/tmp -Duser.home=/data/2/galaxy_db/tmp rules: + - if: helpers.tool_version_gte(tool, '2.15.1') + # see usegalaxy-eu/issues#473: https://github.com/usegalaxy-eu/issues/issues/473 + env: + _JAVA_OPTIONS: -Xmx{int(mem)}G -Xms1G -Djava.io.tmpdir=/data/2/galaxy_db/tmp -Duser.home=/data/2/galaxy_db/tmp - if: 0.1 <= input_size < 1 cores: 20 mem: 100