Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Back merge #11

Merged
merged 61 commits into from
Oct 8, 2024
Merged
Changes from 1 commit
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
2935ab1
Last weeks addition
DLBPointon Aug 5, 2024
d7b8491
Last weeks addition
DLBPointon Aug 5, 2024
ab69ccd
Last weeks addition
DLBPointon Aug 5, 2024
c458efb
Last weeks addition
DLBPointon Aug 5, 2024
04adc75
Adding 2 pipeline nesting method for btk
DLBPointon Aug 7, 2024
ba74c10
Updates to add BTK
DLBPointon Aug 7, 2024
18c3e15
Updates and additions
DLBPointon Aug 8, 2024
2470082
Updates and additions
DLBPointon Aug 8, 2024
56760f8
Updates to complete skeleton of pipeline
DLBPointon Aug 9, 2024
e24bba1
Updating nesting and fixing stuff
DLBPointon Aug 19, 2024
66a5f09
adding merqury_fk
DLBPointon Aug 19, 2024
2fe82af
Updating documentation
DLBPointon Aug 21, 2024
03b074c
Updating documentation
DLBPointon Aug 21, 2024
8b582b6
Module config update
DLBPointon Aug 21, 2024
e39ca7d
Updating subworkflows
DLBPointon Aug 21, 2024
427c6d6
Updating the main workflow file
DLBPointon Aug 21, 2024
b443920
Update to sample yaml and files
DLBPointon Aug 21, 2024
844c575
Merge pull request #1 from sanger-tol/dp24_refactoring
DLBPointon Aug 21, 2024
c89745e
testing
DLBPointon Aug 21, 2024
fd77e2f
Updating the tests
DLBPointon Aug 21, 2024
f8f9456
Updating the tests
DLBPointon Aug 21, 2024
098dae1
upping version of nextflow, due to errors on Actions
DLBPointon Aug 21, 2024
44b0809
Multi-hap support
DLBPointon Aug 21, 2024
eec2539
Corrected GFASTATS error caused by a faulty flag
DLBPointon Sep 2, 2024
0ff29b3
Uncomment workflow
DLBPointon Sep 2, 2024
d5448fa
Update ci.yml
DLBPointon Sep 12, 2024
f476781
Updating the CICD and adding steps
DLBPointon Sep 18, 2024
e819416
Merge branch 'dp24_testdata' of https://github.com/sanger-tol/ear int…
DLBPointon Sep 18, 2024
53242fe
Extra }
DLBPointon Sep 18, 2024
73399cb
Fix steps
DLBPointon Sep 18, 2024
0a441e7
Wrong Pacbio path
DLBPointon Sep 18, 2024
b0fe91f
Wrong Pacbio path
DLBPointon Sep 18, 2024
a758e81
Correct collision
DLBPointon Sep 18, 2024
f429c47
Update for linting
DLBPointon Sep 18, 2024
7f1dd54
PRETTIER
DLBPointon Sep 18, 2024
a8c8189
Template yaml PRETTIER fix
DLBPointon Sep 18, 2024
37324f8
Merge pull request #2 from sanger-tol/dp24_testdata
DLBPointon Sep 18, 2024
229f0a9
Updates
DLBPointon Sep 18, 2024
f647925
Testing addition of ncbidatasets summary module
DLBPointon Sep 18, 2024
c3475ee
not touching ncbi datasets cli
DLBPointon Sep 18, 2024
aab7642
Merge pull request #5 from sanger-tol/dp24_ncbids
DLBPointon Sep 18, 2024
1b68e56
Bug Fix for extra comma in btk module
DLBPointon Sep 19, 2024
74b0025
Merge pull request #6 from sanger-tol/dp24_bug_fix
DLBPointon Sep 19, 2024
e5b60b5
Adding MINIMAP2 resource fix
DLBPointon Sep 20, 2024
870bf41
Updating documentation
DLBPointon Sep 20, 2024
93d17c2
Fix LICENSE lint
DLBPointon Sep 20, 2024
539666d
Merge pull request #7 from sanger-tol/dp24_bug_fix
DLBPointon Sep 20, 2024
fb826a3
Update CHANGELOG.md
DLBPointon Sep 20, 2024
828cf7c
Update nextflow.config
DLBPointon Sep 20, 2024
c393737
Update README.md
DLBPointon Oct 1, 2024
e7e4fc3
Update nextflow.config
DLBPointon Oct 1, 2024
01c3d10
Merge pull request #9 from sanger-tol/DLBPointon-patch-1-1
DLBPointon Oct 8, 2024
79a12a0
Update modules.config
DLBPointon Oct 8, 2024
2fbf412
Update CHANGELOG.md
DLBPointon Oct 8, 2024
a126d8a
Update nextflow.config
DLBPointon Oct 8, 2024
2d2ac6b
Update CHANGELOG.md
DLBPointon Oct 8, 2024
fec5117
Merge branch 'DLBPointon-patch-1' of https://github.com/sanger-tol/ea…
DLBPointon Oct 8, 2024
dfb79a0
updating version info and fixing linting error
DLBPointon Oct 8, 2024
01baf92
Prettier
DLBPointon Oct 8, 2024
8127c7c
New line for editorconfig
DLBPointon Oct 8, 2024
20cb5a4
Merge pull request #10 from sanger-tol/DLBPointon-patch-1
DLBPointon Oct 8, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update ci.yml
  • Loading branch information
DLBPointon authored Sep 12, 2024
commit d5448fae161f39443c0374760c2ced3d00e29a4c
31 changes: 2 additions & 29 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,39 +65,12 @@ jobs:
run: |
nf-core download sanger-tol/ear --revision ${{ steps.branch-names.outputs.current_branch }} --compress none -d --force --outdir sanger-ear --container-cache-utilisation amend --container-system singularity

- name: NF-Core Download - download singularity containers
run: |
nf-core download sanger-tol/blobtoolkit --revision draft_assemblies --compress none -d --force --outdir sanger-ear --container-cache-utilisation amend --container-system singularity

- name: NF-Core Download - download singularity containers
run: |
nf-core download sanger-tol/curationpretext --revision 1.0.0 --compress none -d --force --outdir sanger-ear --container-cache-utilisation amend --container-system singularity

- name: Download Tiny test data
# Download A fungal test data set that is full enough to show some real output.
# Needs a kmer db for merqury
run: |
curl https://tolit.cog.sanger.ac.uk/test-data/resources/treeval/TreeValTinyData.tar.gz | tar xzf -

- name: Download the NCBI taxdump database
run: |
mkdir ncbi_taxdump
curl -L https://ftp.ncbi.nih.gov/pub/taxonomy/new_taxdump/new_taxdump.tar.gz | tar -C ncbi_taxdump -xzf -

- name: Download the BUSCO lineage database
run: |
mkdir busco_database
curl -L https://tolit.cog.sanger.ac.uk/test-data/resources/busco/blobtoolkit.GCA_922984935.2.2023-08-03.lineages.tar.gz | tar -C busco_database -xzf -

- name: Download the subset of NT database
run: |
mkdir NT_database
curl -L https://ftp.ncbi.nlm.nih.gov/blast/db/18S_fungal_sequences.tar.gz | tar -C NT_database -xzf -

- name: Download the subset of Diamond database
run: |
mkdir diamond
wget -c https://tolit.cog.sanger.ac.uk/test-data/resources/diamond/UP000000212_1234679_tax.dmnd -O diamond/UP000000212_1234679_tax.dmnd

# - name: Disk space cleanup
# uses: jlumbroso/free-disk-space@54081f138730dfa15788a46383842cd2f914a1be # v1.3.1

Expand All @@ -106,5 +79,5 @@ jobs:
# For example: adding multiple test runs with different parameters
# Remember that you can parallelise this by using strategy.matrix
run: |
nextflow run ${GITHUB_WORKSPACE} -profile test,docker --outdir ./results
nextflow run ${GITHUB_WORKSPACE} -profile test,singularity --outdir ./results
ls ./results/*/*
Loading