Skip to content

Commit c40de0e

Browse files
drpatelhdrpatelh
committed
Fix merge conflicts
2 parents 46f8bb2 + 4b7695a commit c40de0e

File tree

204 files changed

+24476
-653
lines changed

Some content is hidden

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

204 files changed

+24476
-653
lines changed

‎.github/workflows/awsfulltest.yml‎

Lines changed: 0 additions & 34 deletions
This file was deleted.

‎.github/workflows/awstest.yml‎

Lines changed: 0 additions & 29 deletions
This file was deleted.

‎.github/workflows/ci.yml‎

Lines changed: 245 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,250 @@ jobs:
3535
with:
3636
version: "${{ matrix.NXF_VER }}"
3737

38+
- name: Hash Github Workspace
39+
id: hash_workspace
40+
run: |
41+
echo "digest=$(echo RNA_3.10.1_${{ github.workspace }} | md5sum | cut -c 1-25)" >> $GITHUB_OUTPUT
42+
43+
- name: Cache test data
44+
id: cache-testdata
45+
uses: actions/cache@v3
46+
with:
47+
path: test-datasets/
48+
key: ${{ steps.hash_workspace.outputs.digest }}
49+
50+
- name: Check out test data
51+
if: steps.cache-testdata.outputs.cache-hit != 'true'
52+
uses: actions/checkout@v3
53+
with:
54+
repository: nf-core/test-datasets
55+
ref: rnaseq3
56+
path: test-datasets/
57+
58+
- name: Replace remote paths in samplesheets
59+
run: |
60+
for f in ${{ github.workspace }}/test-datasets/samplesheet/v3.10/*.csv; do
61+
sed -i "s=https://raw.githubusercontent.com/nf-core/test-datasets/rnaseq/=${{ github.workspace }}/test-datasets/=g" $f
62+
echo "========== $f ============"
63+
cat $f
64+
echo "========================================"
65+
done;
66+
3867
- 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
4268
run: |
43-
nextflow run ${GITHUB_WORKSPACE} -profile test,docker --outdir ./results
69+
nextflow run ${GITHUB_WORKSPACE} -profile test,docker --outdir ./results --test_data_base ${{ github.workspace }}/test-datasets/
70+
71+
star_salmon:
72+
name: Test STAR Salmon with workflow parameters
73+
if: ${{ (github.event_name != 'push' || (github.event_name == 'push' && github.repository == 'nf-core/rnaseq')) && !contains(github.event.head_commit.message, '[ci fast]') }}
74+
runs-on: ubuntu-latest
75+
strategy:
76+
matrix:
77+
parameters:
78+
- "--skip_qc"
79+
- "--skip_trimming"
80+
- "--gtf false"
81+
- "--star_index false"
82+
- "--transcript_fasta false"
83+
- "--min_mapped_reads 90"
84+
- "--with_umi"
85+
- "--with_umi --skip_trimming"
86+
- "--remove_ribo_rna --skip_qualimap"
87+
- "--bam_csi_index"
88+
- "--save_align_intermeds --save_reference"
89+
- "--featurecounts_group_type false"
90+
- "--trimmer fastp"
91+
steps:
92+
- name: Check out pipeline code
93+
uses: actions/checkout@v2
94+
95+
- name: Hash Github Workspace
96+
id: hash_workspace
97+
run: |
98+
echo "digest=$(echo RNA_3.10.1_${{ github.workspace }} | md5sum | cut -c 1-25)" >> $GITHUB_OUTPUT
99+
100+
- name: Cache test data
101+
id: cache-testdata
102+
uses: actions/cache@v3
103+
with:
104+
path: test-datasets/
105+
key: ${{ steps.hash_workspace.outputs.digest }}
106+
107+
- name: Check out test data
108+
if: steps.cache-testdata.outputs.cache-hit != 'true'
109+
uses: actions/checkout@v3
110+
with:
111+
repository: nf-core/test-datasets
112+
ref: rnaseq3
113+
path: test-datasets/
114+
115+
- name: Replace remote paths in samplesheets
116+
run: |
117+
for f in ${{ github.workspace }}/test-datasets/samplesheet/v3.10/*.csv; do
118+
sed -i "s=https://raw.githubusercontent.com/nf-core/test-datasets/rnaseq/=${{ github.workspace }}/test-datasets/=g" $f
119+
echo "========== $f ============"
120+
cat $f
121+
echo "========================================"
122+
done;
123+
124+
- name: Install Nextflow
125+
run: |
126+
wget -qO- get.nextflow.io | bash
127+
sudo mv nextflow /usr/local/bin/
128+
129+
- name: Run pipeline with STAR and various parameters
130+
run: |
131+
nextflow run ${GITHUB_WORKSPACE} -profile test,docker --aligner star_salmon ${{ matrix.parameters }} --outdir ./results --test_data_base ${{ github.workspace }}/test-datasets/
132+
133+
star_rsem:
134+
name: Test STAR RSEM with workflow parameters
135+
if: ${{ (github.event_name != 'push' || (github.event_name == 'push' && github.repository == 'nf-core/rnaseq')) && !contains(github.event.head_commit.message, '[ci fast]') }}
136+
runs-on: ubuntu-latest
137+
strategy:
138+
matrix:
139+
parameters:
140+
- "--skip_qc"
141+
- "--rsem_index false"
142+
steps:
143+
- name: Check out pipeline code
144+
uses: actions/checkout@v2
145+
146+
- name: Hash Github Workspace
147+
id: hash_workspace
148+
run: |
149+
echo "digest=$(echo RNA_3.10.1_${{ github.workspace }} | md5sum | cut -c 1-25)" >> $GITHUB_OUTPUT
150+
151+
- name: Cache test data
152+
id: cache-testdata
153+
uses: actions/cache@v3
154+
with:
155+
path: test-datasets/
156+
key: ${{ steps.hash_workspace.outputs.digest }}
157+
158+
- name: Check out test data
159+
if: steps.cache-testdata.outputs.cache-hit != 'true'
160+
uses: actions/checkout@v3
161+
with:
162+
repository: nf-core/test-datasets
163+
ref: rnaseq3
164+
path: test-datasets/
165+
166+
- name: Replace remote paths in samplesheets
167+
run: |
168+
for f in ${{ github.workspace }}/test-datasets/samplesheet/v3.10/*.csv; do
169+
sed -i "s=https://raw.githubusercontent.com/nf-core/test-datasets/rnaseq/=${{ github.workspace }}/test-datasets/=g" $f
170+
echo "========== $f ============"
171+
cat $f
172+
echo "========================================"
173+
done;
174+
175+
- name: Install Nextflow
176+
run: |
177+
wget -qO- get.nextflow.io | bash
178+
sudo mv nextflow /usr/local/bin/
179+
180+
- name: Run pipeline with RSEM STAR and various parameters
181+
run: |
182+
nextflow run ${GITHUB_WORKSPACE} -profile test,docker --aligner star_rsem ${{ matrix.parameters }} --outdir ./results --test_data_base ${{ github.workspace }}/test-datasets/
183+
184+
hisat2:
185+
name: Test HISAT2 with workflow parameters
186+
if: ${{ (github.event_name != 'push' || (github.event_name == 'push' && github.repository == 'nf-core/rnaseq')) && !contains(github.event.head_commit.message, '[ci fast]') }}
187+
runs-on: ubuntu-latest
188+
strategy:
189+
matrix:
190+
parameters:
191+
- "--skip_qc"
192+
- "--hisat2_index false"
193+
steps:
194+
- name: Check out pipeline code
195+
uses: actions/checkout@v2
196+
197+
- name: Hash Github Workspace
198+
id: hash_workspace
199+
run: |
200+
echo "digest=$(echo RNA_3.10.1_${{ github.workspace }} | md5sum | cut -c 1-25)" >> $GITHUB_OUTPUT
201+
202+
- name: Cache test data
203+
id: cache-testdata
204+
uses: actions/cache@v3
205+
with:
206+
path: test-datasets/
207+
key: ${{ steps.hash_workspace.outputs.digest }}
208+
209+
- name: Check out test data
210+
if: steps.cache-testdata.outputs.cache-hit != 'true'
211+
uses: actions/checkout@v3
212+
with:
213+
repository: nf-core/test-datasets
214+
ref: rnaseq3
215+
path: test-datasets/
216+
217+
- name: Replace remote paths in samplesheets
218+
run: |
219+
for f in ${{ github.workspace }}/test-datasets/samplesheet/v3.10/*.csv; do
220+
sed -i "s=https://raw.githubusercontent.com/nf-core/test-datasets/rnaseq/=${{ github.workspace }}/test-datasets/=g" $f
221+
echo "========== $f ============"
222+
cat $f
223+
echo "========================================"
224+
done;
225+
226+
- name: Install Nextflow
227+
run: |
228+
wget -qO- get.nextflow.io | bash
229+
sudo mv nextflow /usr/local/bin/
230+
231+
- name: Run pipeline with HISAT2 and various parameters
232+
run: |
233+
nextflow run ${GITHUB_WORKSPACE} -profile test,docker --aligner hisat2 ${{ matrix.parameters }} --outdir ./results --test_data_base ${{ github.workspace }}/test-datasets/
234+
235+
salmon:
236+
name: Test Salmon with workflow parameters
237+
if: ${{ (github.event_name != 'push' || (github.event_name == 'push' && github.repository == 'nf-core/rnaseq')) && !contains(github.event.head_commit.message, '[ci fast]') }}
238+
runs-on: ubuntu-latest
239+
strategy:
240+
matrix:
241+
parameters:
242+
- "--skip_qc --skip_alignment"
243+
- "--salmon_index false --transcript_fasta false"
244+
steps:
245+
- name: Check out pipeline code
246+
uses: actions/checkout@v2
247+
248+
- name: Hash Github Workspace
249+
id: hash_workspace
250+
run: |
251+
echo "digest=$(echo RNA_3.10.1_${{ github.workspace }} | md5sum | cut -c 1-25)" >> $GITHUB_OUTPUT
252+
253+
- name: Cache test data
254+
id: cache-testdata
255+
uses: actions/cache@v3
256+
with:
257+
path: test-datasets/
258+
key: ${{ steps.hash_workspace.outputs.digest }}
259+
260+
- name: Check out test data
261+
if: steps.cache-testdata.outputs.cache-hit != 'true'
262+
uses: actions/checkout@v3
263+
with:
264+
repository: nf-core/test-datasets
265+
ref: rnaseq3
266+
path: test-datasets/
267+
268+
- name: Replace remote paths in samplesheets
269+
run: |
270+
for f in ${{ github.workspace }}/test-datasets/samplesheet/v3.10/*.csv; do
271+
sed -i "s=https://raw.githubusercontent.com/nf-core/test-datasets/rnaseq/=${{ github.workspace }}/test-datasets/=g" $f
272+
echo "========== $f ============"
273+
cat $f
274+
echo "========================================"
275+
done;
276+
277+
- name: Install Nextflow
278+
run: |
279+
wget -qO- get.nextflow.io | bash
280+
sudo mv nextflow /usr/local/bin/
281+
282+
- name: Run pipeline with Salmon and various parameters
283+
run: |
284+
nextflow run ${GITHUB_WORKSPACE} -profile test,docker --pseudo_aligner salmon ${{ matrix.parameters }} --outdir ./results --test_data_base ${{ github.workspace }}/test-datasets/

0 commit comments

Comments
 (0)