Merge pull request #23 from CarsonJM/development

Only run CI when merging into master branch
HoffLab · Apr 29, 2024 · 85414bc · 85414bc
2 parents cd1397a + 3b9edfe
commit 85414bc
Show file tree

Hide file tree

Showing 17 changed files with 1,230 additions and 8 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -2,11 +2,11 @@
 name: nf-core CI
 on:
   pull_request:
+    branches:
+      - master
   release:
     types: [published]
   merge_group:
-    types:
-      - checks_requested
     branches:
       - master
 

diff --git a/.nf-core.yml b/.nf-core.yml
@@ -1,5 +1,8 @@
 lint:
+  actions_ci: false
   files_exist:
+    - conf/modules.config
+    - conf/test_full.config
     - CODE_OF_CONDUCT.md
     - assets/nf-core-biobakerymgx_logo_light.png
     - docs/images/nf-core-biobakerymgx_logo_light.png
@@ -9,6 +12,9 @@ lint:
     - .github/workflows/awsfulltest.yml
     - conf/igenomes.config
   files_unchanged:
+    - .github/PULL_REQUEST_TEMPLATE.md
+    - .github/CONTRIBUTING.md
+    - .github/workflows/linting.yml
     - CODE_OF_CONDUCT.md
     - assets/nf-core-biobakerymgx_logo_light.png
     - docs/images/nf-core-biobakerymgx_logo_light.png

diff --git a/modules.json b/modules.json
@@ -23,17 +23,20 @@
                     "metaphlan/makedb": {
                         "branch": "master",
                         "git_sha": "3f5420aa22e00bd030a2556dfdffc9e164ec0ec5",
-                        "installed_by": ["modules"]
+                        "installed_by": ["modules"],
+                        "patch": "modules/nf-core/metaphlan/makedb/metaphlan-makedb.diff"
                     },
                     "metaphlan/mergemetaphlantables": {
                         "branch": "master",
                         "git_sha": "3f5420aa22e00bd030a2556dfdffc9e164ec0ec5",
-                        "installed_by": ["modules"]
+                        "installed_by": ["modules"],
+                        "patch": "modules/nf-core/metaphlan/mergemetaphlantables/metaphlan-mergemetaphlantables.diff"
                     },
                     "metaphlan/metaphlan": {
                         "branch": "master",
                         "git_sha": "3f5420aa22e00bd030a2556dfdffc9e164ec0ec5",
-                        "installed_by": ["modules"]
+                        "installed_by": ["modules"],
+                        "patch": "modules/nf-core/metaphlan/metaphlan/metaphlan-metaphlan.diff"
                     },
                     "multiqc": {
                         "branch": "master",

diff --git a/modules/nf-core/custom/dumpsoftwareversions/environment.yml b/modules/nf-core/custom/dumpsoftwareversions/environment.yml
diff --git a/modules/nf-core/custom/dumpsoftwareversions/main.nf b/modules/nf-core/custom/dumpsoftwareversions/main.nf
diff --git a/modules/nf-core/custom/dumpsoftwareversions/meta.yml b/modules/nf-core/custom/dumpsoftwareversions/meta.yml
diff --git a/modules/nf-core/custom/dumpsoftwareversions/templates/dumpsoftwareversions.py b/modules/nf-core/custom/dumpsoftwareversions/templates/dumpsoftwareversions.py
diff --git a/modules/nf-core/custom/dumpsoftwareversions/tests/main.nf.test b/modules/nf-core/custom/dumpsoftwareversions/tests/main.nf.test
diff --git a/modules/nf-core/custom/dumpsoftwareversions/tests/main.nf.test.snap b/modules/nf-core/custom/dumpsoftwareversions/tests/main.nf.test.snap
diff --git a/modules/nf-core/custom/dumpsoftwareversions/tests/tags.yml b/modules/nf-core/custom/dumpsoftwareversions/tests/tags.yml