Merge branch 'develop' into update/metafusion

mskcc · Oct 10, 2024 · 8d6d171 · 8d6d171
2 parents aeac5f0 + dce1712
commit 8d6d171
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/.github/workflows/linting.yml b/.github/workflows/linting.yml
@@ -16,7 +16,9 @@ jobs:
     steps:
       - uses: actions/checkout@v3
 
-      - uses: actions/setup-node@v3
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 20
 
       - name: Install editorconfig-checker
         run: npm install -g editorconfig-checker

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -19,6 +19,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - [#125](https://github.com/mskcc/forte/pull/125) - update upload-artifact version because the version previously in use (v2) is deprecated.
 - [#126](https://github.com/mskcc/forte/pull/126) - 0 based gene bed annotation with removal of incomplete transcripts
 
+- [#124](https://github.com/mskcc/forte/pull/124) - ensure genebed file as 0based start site
+
+- [#127](https://github.com/mskcc/forte/pull/127) - allow dynamic increase of memory for process_single label
+
 ### `Dependencies`
 
 ### `Deprecated`

diff --git a/conf/juno.config b/conf/juno.config
@@ -15,7 +15,7 @@ process {
 
     withLabel:process_single {
         cpus   = { check_max( 1, 'cpus' )                                                     }
-        memory = { round_memory( check_max( 8.GB * task.cpus, 'memory' )/task.cpus, "down")   }
+        memory = { check_max( 8.GB * task.attempt, 'memory' )                                    }
         time   = { check_max( 4.h  * task.attempt, 'time'    )                                }
     }
     withLabel:process_low {