Merge pull request #26 from nf-core/nf-core-template-merge-3.2.1

Important! Template update for nf-core/tools v3.2.1

Author: olgabot

.github/workflows/awsfulltest.yml

@@ -4,44 +4,23 @@ name: nf-core AWS full size tests
 # It runs the -profile 'test_full' on AWS batch
 
 on:
-  pull_request:
-    branches:
-      - main
-      - master
   workflow_dispatch:
   pull_request_review:
     types: [submitted]
+  release:
+    types: [published]
 
 jobs:
   run-platform:
     name: Run AWS full tests
-    # run only if the PR is approved by at least 2 reviewers and against the master branch or manually triggered
-    if: github.repository == 'nf-core/proteinannotator' && github.event.review.state == 'approved' && github.event.pull_request.base.ref == 'master' || github.event_name == 'workflow_dispatch'
+    # run only if the PR is approved by at least 2 reviewers and against the master/main branch or manually triggered
+    if: github.repository == 'nf-core/proteinannotator' && github.event.review.state == 'approved' && (github.event.pull_request.base.ref == 'master' || github.event.pull_request.base.ref == 'main') || github.event_name == 'workflow_dispatch'
     runs-on: ubuntu-latest
     steps:
-      - name: Get PR reviews
-        uses: octokit/request-action@v2.x
-        if: github.event_name != 'workflow_dispatch'
-        id: check_approvals
-        continue-on-error: true
-        with:
-          route: GET /repos/${{ github.repository }}/pulls/${{ github.event.pull_request.number }}/reviews?per_page=100
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Check for approvals
-        if: ${{ failure() && github.event_name != 'workflow_dispatch' }}
-        run: |
-          echo "No review approvals found. At least 2 approvals are required to run this action automatically."
-          exit 1
-
-      - name: Check for enough approvals (>=2)
-        id: test_variables
-        if: github.event_name != 'workflow_dispatch'
+      - name: Set revision variable
+        id: revision
         run: |
-          JSON_RESPONSE='${{ steps.check_approvals.outputs.data }}'
-          CURRENT_APPROVALS_COUNT=$(echo $JSON_RESPONSE | jq -c '[.[] | select(.state | contains("APPROVED")) ] | length')
-          test $CURRENT_APPROVALS_COUNT -ge 2 || exit 1 # At least 2 approvals are required
+          echo "revision=${{ (github.event_name == 'workflow_dispatch' || github.event_name == 'release') && github.sha || 'dev' }}" >> "$GITHUB_OUTPUT"
 
       - name: Launch workflow via Seqera Platform
         uses: seqeralabs/action-tower-launch@v2
@@ -52,12 +31,12 @@ jobs:
           workspace_id: ${{ secrets.TOWER_WORKSPACE_ID }}
           access_token: ${{ secrets.TOWER_ACCESS_TOKEN }}
           compute_env: ${{ secrets.TOWER_COMPUTE_ENV }}
-          revision: ${{ github.sha }}
-          workdir: s3://${{ secrets.AWS_S3_BUCKET }}/work/proteinannotator/work-${{ github.sha }}
+          revision: ${{ steps.revision.outputs.revision }}
+          workdir: s3://${{ secrets.AWS_S3_BUCKET }}/work/proteinannotator/work-${{ steps.revision.outputs.revision }}
           parameters: |
             {
               "hook_url": "${{ secrets.MEGATESTS_ALERTS_SLACK_HOOK_URL }}",
-              "outdir": "s3://${{ secrets.AWS_S3_BUCKET }}/proteinannotator/results-${{ github.sha }}"
+              "outdir": "s3://${{ secrets.AWS_S3_BUCKET }}/proteinannotator/results-${{ steps.revision.outputs.revision }}"
             }
           profiles: test_full
 

.github/workflows/ci.yml

@@ -83,5 +83,6 @@ jobs:
         uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be # v1.3.1
 
       - name: "Run pipeline with test data ${{ matrix.NXF_VER }} | ${{ matrix.test_name }} | ${{ matrix.profile }}"
+        continue-on-error: ${{ matrix.NXF_VER == 'latest-everything' }}
         run: |
           nextflow run ${GITHUB_WORKSPACE} -profile ${{ matrix.test_name }},${{ matrix.profile }} --outdir ./results

.nf-core.yml

@@ -1,23 +1,20 @@
-repository_type: pipeline
-
-nf_core_version: 3.2.0
-
 lint:
   files_unchanged:
     - assets/nf-core-proteinannotator_logo_light.png
     - docs/images/nf-core-proteinannotator_logo_light.png
     - docs/images/nf-core-proteinannotator_logo_dark.png
-
+nf_core_version: 3.2.1
+repository_type: pipeline
 template:
-  org: nf-core
-  name: proteinannotator
+  author: Olga Botvinnik
   description: The best protein annotation pipeline in the world. Protein fasta ->
     ??? -> Annotations!
-  author: Olga Botvinnik
   version: 1.0.0dev
   force: true
   outdir: .
   skip_features:
     - fastqc
     - igenomes
   is_nfcore: true
+  name: proteinannotator
+  org: nf-core

CITATIONS.md

@@ -10,10 +10,6 @@
 
 ## Pipeline tools
 
-- [FastQC](https://www.bioinformatics.babraham.ac.uk/projects/fastqc/)
-
-> Andrews, S. (2010). FastQC: A Quality Control Tool for High Throughput Sequence Data [Online].
-
 - [MultiQC](https://pubmed.ncbi.nlm.nih.gov/27312411/)
 
 > Ewels P, Magnusson M, Lundin S, Käller M. MultiQC: summarize analysis results for multiple tools and samples in a single report. Bioinformatics. 2016 Oct 1;32(19):3047-8. doi: 10.1093/bioinformatics/btw354. Epub 2016 Jun 16. PubMed PMID: 27312411; PubMed Central PMCID: PMC5039924.