Corrected test labels, GPU tests with latest-everything, corrected en…

…v vars and excluded cancelled from confirm-pass
nf-core · Dec 9, 2024 · ef2cdcb · ef2cdcb
1 parent ddb99ae
commit ef2cdcb
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 15 deletions.
diff --git a/.github/actions/nf-test/action.yml b/.github/actions/nf-test/action.yml
@@ -28,7 +28,7 @@ runs:
     - name: Setup Nextflow
       uses: nf-core/setup-nextflow@v2
       with:
-        version: "${{ env.NXF_VERSION }}"
+        version: "${{ env.NXF_VER }}"
 
     - name: Set up Python
       uses: actions/setup-python@0b93645e9fea7318ecaed2b359559ac225c90a2b # v5

diff --git a/.github/workflows/nf-test-gpu.yml b/.github/workflows/nf-test-gpu.yml
@@ -25,8 +25,6 @@ env:
   NXF_ANSI_LOG: false
   NXF_SINGULARITY_CACHEDIR: ${{ github.workspace }}/.singularity
   NXF_SINGULARITY_LIBRARYDIR: ${{ github.workspace }}/.singularity
-  # renovate: datasource=github-releases depName=nextflow-io/nextflow versioning=semver
-  NXF_VER: "24.10.2"
 
 jobs:
   get-shards:
@@ -57,19 +55,23 @@ jobs:
           echo "total_shards=${{ steps.set-shards.outputs.total_shards }}" >> $GITHUB_ENV
 
   nf-test-gpu:
-    runs-on: "gpu"
-    name: "GPU Test | ${{ matrix.profile }} | ${{ matrix.shard }}"
     needs: [get-shards]
+    runs-on: "gpu"
+    name: "GPU Test | ${{ matrix.profile }} | ${{ matrix.shard }} | ${{ matrix.NXF_VER }} | ${{ matrix.filters }}"
+    env:
+      NXF_VER: ${{ matrix.NXF_VER }}
+
     # Only run on push if this is the nf-core dev branch (merged PRs)
     if: "${{ github.event_name != 'push' || (github.event_name == 'push' && github.repository == 'nf-core/methylseq') }}"
     strategy:
       fail-fast: false
       matrix:
+        profile: [docker_self_hosted, singularity]
+        shard: ${{ fromJson(needs.get-shards.outputs.shard) }}
         NXF_VER:
           - "24.04.2"
-        shard: ${{ fromJson(needs.get-shards.outputs.shard) }}
+          - "latest-everything"
         filters: [pipeline]
-        profile: [docker_self_hosted, singularity]
 
     steps:
       - name: Check out pipeline code
@@ -92,7 +94,7 @@ jobs:
     if: always()
     steps:
       - name: All tests ok
-        if: ${{ success() || !contains(needs.*.result, 'failure') }}
+        if: ${{ ( success() || !contains(needs.*.result, 'failure') ) && !cancelled() }}
         run: exit 0
       - name: One or more tests failed
         if: ${{ contains(needs.*.result, 'failure') }}

diff --git a/.github/workflows/nf-test.yml b/.github/workflows/nf-test.yml
@@ -28,8 +28,6 @@ env:
   NXF_ANSI_LOG: false
   NXF_SINGULARITY_CACHEDIR: ${{ github.workspace }}/.singularity
   NXF_SINGULARITY_LIBRARYDIR: ${{ github.workspace }}/.singularity
-  # renovate: datasource=github-releases depName=nextflow-io/nextflow versioning=semver
-  NXF_VER: "24.10.2"
 
 jobs:
   get-shards:
@@ -60,20 +58,24 @@ jobs:
           echo "total_shards=${{ steps.set-shards.outputs.total_shards }}" >> $GITHUB_ENV
 
   nf-test:
-    runs-on: ${{ github.event.inputs.runners || 'self-hosted' }}
-    name: "Test | ${{ matrix.profile }} | ${{ matrix.shard }}"
     needs: [get-shards]
+    runs-on: ${{ github.event.inputs.runners || 'self-hosted' }}
+    name: "Test | ${{ matrix.profile }} | ${{ matrix.shard }} | ${{ matrix.NXF_VER }} | ${{ matrix.filters }}"
+    env:
+      NXF_VER: ${{ matrix.NXF_VER }}
+
     # Only run on push if this is the nf-core dev branch (merged PRs)
     if: "${{ github.event_name != 'push' || (github.event_name == 'push' && github.repository == 'nf-core/methylseq') }}"
+
     strategy:
       fail-fast: false
       matrix:
+        profile: [conda, docker_self_hosted, singularity]
+        shard: ${{ fromJson(needs.get-shards.outputs.shard) }}
         NXF_VER:
           - "24.04.2"
           - "latest-everything"
-        shard: ${{ fromJson(needs.get-shards.outputs.shard) }}
         filters: [pipeline]
-        profile: [conda, docker_self_hosted, singularity]
 
     steps:
       - name: Check out pipeline code
@@ -96,7 +98,7 @@ jobs:
     if: always()
     steps:
       - name: All tests ok
-        if: ${{ success() || !contains(needs.*.result, 'failure') }}
+        if: ${{ ( success() || !contains(needs.*.result, 'failure') ) && !cancelled() }}
         run: exit 0
       - name: One or more tests failed
         if: ${{ contains(needs.*.result, 'failure') }}