Skip to content

Commit bd18b6c

Browse files
drpatelhdrpatelh
committed
Fix merge conflicts
2 parents 72edef2 + bddc865 commit bd18b6c

File tree

187 files changed

+21574
-825
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

187 files changed

+21574
-825
lines changed

‎.github/workflows/awsfulltest.yml‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,20 +12,22 @@ jobs:
1212
name: Run AWS full tests
1313
if: github.repository == 'nf-core/rnaseq'
1414
runs-on: ubuntu-latest
15+
# Do a full-scale run with each of the three aligners
16+
strategy:
17+
matrix:
18+
aligner: ["star_salmon", "star_rsem", "hisat2"]
1519
steps:
1620
- name: Launch workflow via tower
1721
uses: nf-core/tower-action@v3
18-
# TODO nf-core: You can customise AWS full pipeline tests as required
19-
# Add full size test data (but still relatively small datasets for few samples)
20-
# on the `test_full.config` test runs with only one set of parameters
2122
with:
2223
workspace_id: ${{ secrets.TOWER_WORKSPACE_ID }}
2324
access_token: ${{ secrets.TOWER_ACCESS_TOKEN }}
2425
compute_env: ${{ secrets.TOWER_COMPUTE_ENV }}
2526
workdir: s3://${{ secrets.AWS_S3_BUCKET }}/work/rnaseq/work-${{ github.sha }}
2627
parameters: |
2728
{
28-
"outdir": "s3://${{ secrets.AWS_S3_BUCKET }}/rnaseq/results-${{ github.sha }}"
29+
"outdir" : "s3://${{ secrets.AWS_S3_BUCKET }}/rnaseq/results-${{ github.sha }}/aligner_${{ matrix.aligner }}",
30+
"aligner": "${{ matrix.aligner }}"
2931
}
3032
profiles: test_full,aws_tower
3133
- uses: actions/upload-artifact@v3

‎.github/workflows/ci.yml‎

Lines changed: 98 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,103 @@ jobs:
3232
version: "${{ matrix.NXF_VER }}"
3333

3434
- name: Run pipeline with test data
35-
# TODO nf-core: You can customise CI pipeline run tests as required
36-
# For example: adding multiple test runs with different parameters
37-
# Remember that you can parallelise this by using strategy.matrix
3835
run: |
3936
nextflow run ${GITHUB_WORKSPACE} -profile test,docker --outdir ./results
37+
38+
star_salmon:
39+
name: Test STAR Salmon with workflow parameters
40+
if: ${{ github.event_name != 'push' || (github.event_name == 'push' && github.repository == 'nf-core/rnaseq') }}
41+
runs-on: ubuntu-latest
42+
strategy:
43+
matrix:
44+
parameters:
45+
- "--skip_qc"
46+
- "--skip_trimming"
47+
- "--gtf false"
48+
- "--star_index false"
49+
- "--transcript_fasta false"
50+
- "--min_mapped_reads 90"
51+
- "--with_umi"
52+
- "--with_umi --skip_trimming"
53+
- "--remove_ribo_rna --skip_qualimap"
54+
- "--bam_csi_index"
55+
- "--save_align_intermeds --save_reference"
56+
- "--featurecounts_group_type false"
57+
steps:
58+
- name: Check out pipeline code
59+
uses: actions/checkout@v2
60+
61+
- name: Install Nextflow
62+
run: |
63+
wget -qO- get.nextflow.io | bash
64+
sudo mv nextflow /usr/local/bin/
65+
66+
- name: Run pipeline with STAR and various parameters
67+
run: |
68+
nextflow run ${GITHUB_WORKSPACE} -profile test,docker --aligner star_salmon ${{ matrix.parameters }} --outdir ./results
69+
70+
star_rsem:
71+
name: Test STAR RSEM with workflow parameters
72+
if: ${{ github.event_name != 'push' || (github.event_name == 'push' && github.repository == 'nf-core/rnaseq') }}
73+
runs-on: ubuntu-latest
74+
strategy:
75+
matrix:
76+
parameters:
77+
- "--skip_qc"
78+
- "--rsem_index false"
79+
steps:
80+
- name: Check out pipeline code
81+
uses: actions/checkout@v2
82+
83+
- name: Install Nextflow
84+
run: |
85+
wget -qO- get.nextflow.io | bash
86+
sudo mv nextflow /usr/local/bin/
87+
88+
- name: Run pipeline with RSEM STAR and various parameters
89+
run: |
90+
nextflow run ${GITHUB_WORKSPACE} -profile test,docker --aligner star_rsem ${{ matrix.parameters }} --outdir ./results
91+
92+
hisat2:
93+
name: Test HISAT2 with workflow parameters
94+
if: ${{ github.event_name != 'push' || (github.event_name == 'push' && github.repository == 'nf-core/rnaseq') }}
95+
runs-on: ubuntu-latest
96+
strategy:
97+
matrix:
98+
parameters:
99+
- "--skip_qc"
100+
- "--hisat2_index false"
101+
steps:
102+
- name: Check out pipeline code
103+
uses: actions/checkout@v2
104+
105+
- name: Install Nextflow
106+
run: |
107+
wget -qO- get.nextflow.io | bash
108+
sudo mv nextflow /usr/local/bin/
109+
110+
- name: Run pipeline with HISAT2 and various parameters
111+
run: |
112+
nextflow run ${GITHUB_WORKSPACE} -profile test,docker --aligner hisat2 ${{ matrix.parameters }} --outdir ./results
113+
114+
salmon:
115+
name: Test Salmon with workflow parameters
116+
if: ${{ github.event_name != 'push' || (github.event_name == 'push' && github.repository == 'nf-core/rnaseq') }}
117+
runs-on: ubuntu-latest
118+
strategy:
119+
matrix:
120+
parameters:
121+
- "--skip_qc --skip_alignment"
122+
- "--salmon_index false --transcript_fasta false"
123+
steps:
124+
- name: Check out pipeline code
125+
uses: actions/checkout@v2
126+
127+
- name: Install Nextflow
128+
run: |
129+
wget -qO- get.nextflow.io | bash
130+
sudo mv nextflow /usr/local/bin/
131+
132+
- name: Run pipeline with Salmon and various parameters
133+
run: |
134+
nextflow run ${GITHUB_WORKSPACE} -profile test,docker --pseudo_aligner salmon ${{ matrix.parameters }} --outdir ./results

‎.nf-core.yml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,6 @@
11
repository_type: pipeline
2+
lint:
3+
files_unchanged:
4+
- assets/email_template.html
5+
- assets/email_template.txt
6+
- lib/NfcoreTemplate.groovy

0 commit comments

Comments
 (0)