Skip to content

Commit ed9d58e

Browse files
drpatelhdrpatelh
committed
Fix merge conflicts
2 parents e8d1627 + 24eb379 commit ed9d58e

File tree

192 files changed

+22237
-555
lines changed

Some content is hidden

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

192 files changed

+22237
-555
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
@@ -36,8 +36,103 @@ jobs:
3636
version: "${{ matrix.NXF_VER }}"
3737

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