Merge pull request #2706 from mashehu/fix-editorconfig

Avoid conflicts between editorconfig and prettier linting
nf-core · Feb 7, 2024 · 7899cd5 · 7899cd5
2 parents 31b1db7 + 0b1903a
commit 7899cd5
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 8 deletions.
diff --git a/.github/workflows/create-lint-wf.yml b/.github/workflows/create-lint-wf.yml
@@ -26,7 +26,7 @@ env:
 
 jobs:
   MakeTestWorkflow:
-    runs-on: ${{ github.event.inputs.runners || 'self-hosted' }}
+    runs-on: ${{ github.event.inputs.runners || github.run_number > 1 && 'ubuntu-latest' || 'self-hosted' }}
     env:
       NXF_ANSI_LOG: false
     strategy:

diff --git a/.github/workflows/create-test-lint-wf-template.yml b/.github/workflows/create-test-lint-wf-template.yml
@@ -39,7 +39,8 @@ jobs:
           - "template_skip_igenomes.yml"
           - "template_skip_ci.yml"
         runner:
-          - ${{ github.event.inputs.runners || 'self-hosted' }}
+          # use the runner given by the input if it is dispatched manually, run on github if it is a rerun or on self-hosted by default
+          - ${{ github.event.inputs.runners || github.run_number > 1 && 'ubuntu-latest' || 'self-hosted' }}
         profile: ["self_hosted_runner"]
         include:
           - TEMPLATE: "template_skip_all.yml"

diff --git a/.github/workflows/create-test-wf.yml b/.github/workflows/create-test-wf.yml
@@ -26,7 +26,8 @@ env:
 
 jobs:
   RunTestWorkflow:
-    runs-on: ${{ github.event.inputs.runners || 'self-hosted' }}
+    # use the runner given by the input if it is dispatched manually, run on github if it is a rerun or on self-hosted by default
+    runs-on: ${{ github.event.inputs.runners || github.run_number > 1 && 'ubuntu-latest' || 'self-hosted' }}
     env:
       NXF_ANSI_LOG: false
     strategy:

diff --git a/.github/workflows/pytest.yml b/.github/workflows/pytest.yml
@@ -72,7 +72,8 @@ jobs:
     name: Run ${{matrix.test}} with Python ${{ needs.setup.outputs.python-version }} on ${{ needs.setup.outputs.runner }}
     needs: [setup, list_tests]
     if: ${{ needs.setup.outputs.run-tests }}
-    runs-on: ${{ github.event.inputs.runners || 'self-hosted' }}
+    # run on self-hosted runners for test_components.py (because of the gitlab branch), based on the input if it is dispatched manually, on github if it is a rerun or on self-hosted by default
+    runs-on: ${{ matrix.test == 'test_components.py' && 'self-hosted' || (github.event.inputs.runners || github.run_number > 1 && 'ubuntu-latest' || 'self-hosted') }}
     strategy:
       matrix: ${{ fromJson(needs.list_tests.outputs.tests) }}
       fail-fast: false # run all tests even if one fails
@@ -162,7 +163,8 @@ jobs:
 
   coverage:
     needs: test
-    runs-on: ${{ github.event.inputs.runners || 'self-hosted' }}
+    # use the runner given by the input if it is dispatched manually, run on github if it is a rerun or on self-hosted by default
+    runs-on: ${{ github.event.inputs.runners || github.run_number > 1 && 'ubuntu-latest' || 'self-hosted' }}
     steps:
       - name: go to subdirectory
         run: |

diff --git a/.github/workflows/sync.yml b/.github/workflows/sync.yml
@@ -23,7 +23,7 @@ concurrency:
 
 jobs:
   get-pipelines:
-    runs-on: ${{ github.event.inputs.runners || 'self-hosted' }}
+    runs-on: "ubuntu-latest"
     outputs:
       matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
@@ -38,7 +38,8 @@ jobs:
 
   sync:
     needs: get-pipelines
-    runs-on: ${{ github.event.inputs.runners || 'self-hosted' }}
+    # use the runner given by the input if it is dispatched manually, run on github if it is a rerun or on self-hosted by default
+    runs-on: ${{ github.event.inputs.runners || github.run_number > 1 && 'ubuntu-latest' || 'self-hosted' }}
     strategy:
       matrix: ${{fromJson(needs.get-pipelines.outputs.matrix)}}
       fail-fast: false

diff --git a/nf_core/pipeline-template/.editorconfig b/nf_core/pipeline-template/.editorconfig
@@ -28,5 +28,5 @@ indent_size = unset
 indent_style = unset
 
 # ignore python
-[*.{py}]
+[*.{py,md}]
 indent_style = unset