Merge pull request #2640 from mashehu/use-pdiff-in-gitpot

use pdiff also on gitpod for nf-test
nf-core · Jan 8, 2024 · 19d2c4a · 19d2c4a
2 parents e0dabc9 + 9b45d58
commit 19d2c4a
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 0 deletions.
diff --git a/.gitpod.yml b/.gitpod.yml
@@ -9,6 +9,12 @@ tasks:
   - name: unset JAVA_TOOL_OPTIONS
     command: |
       unset JAVA_TOOL_OPTIONS
+
+  - name: Use pdiff for nf-test diff viewing
+    command: |
+      export NFT_DIFF="pdiff"
+      export NFT_DIFF_ARGS="--line-numbers --expand-tabs=2"
+
 vscode:
   extensions: # based on nf-core.nf-core-extensionpack
     - codezombiech.gitignore # Language support for .gitignore files

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,7 @@
 ### Template
 
 - Use `pre-commit` to lint files in GitHub CI ([#2635](https://github.com/nf-core/tools/pull/2635))
+- Use pdiff also on gitpod for nf-test ([#2640](https://github.com/nf-core/tools/pull/2640))
 
 ### Download
 

diff --git a/nf_core/pipeline-template/.gitpod.yml b/nf_core/pipeline-template/.gitpod.yml
@@ -7,6 +7,10 @@ tasks:
   - name: unset JAVA_TOOL_OPTIONS
     command: |
       unset JAVA_TOOL_OPTIONS
+  - name: Use pdiff for nf-test diff viewing
+    command: |
+      export NFT_DIFF="pdiff"
+      export NFT_DIFF_ARGS="--line-numbers --expand-tabs=2"
 vscode:
   extensions: # based on nf-core.nf-core-extensionpack
     - codezombiech.gitignore # Language support for .gitignore files