Skip to content

Commit

Permalink
Merge branch 'iss76' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
arnikz committed Nov 30, 2020
2 parents 37f6b51 + 6669847 commit aad71ff
Show file tree
Hide file tree
Showing 44 changed files with 4,140 additions and 22,927 deletions.
25 changes: 25 additions & 0 deletions .editorconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# EditorConfig is awesome: http://EditorConfig.org

# top-most EditorConfig file
root = true

# Unix-style newlines with a newline ending every file
[*]
end_of_line = lf
insert_final_newline = true
trim_trailing_whitespace = true
# Set default charset
charset = utf-8

# Matches multiple files with brace expansion notation

# 4 space indentation
[*.{py,java,r,R}]
indent_size = 4

# 2 space indentation
[*.{js,json,yml,html,xml}]
indent_size = 2

[*.{md,Rmd}]
trim_trailing_whitespace = false
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ env:
global:
- PREFIX=gtcg/xenon
- BAM=data/test.bam
- CHROM="12 22"
- SEQIDS="12,22"
matrix:
- PORT=10022 IMG=gridengine TAG=6 SCH=local
- PORT=10023 IMG=gridengine TAG=6 SCH=gridengine
Expand All @@ -23,4 +23,4 @@ install:
- docker exec -t $SCH chown -R xenon:xenon /home/xenon
- docker exec -u xenon -t $SCH ./install.sh
script:
- docker exec -u xenon -t $SCH ./run.sh $SCH $BAM $CHROM
- docker exec -u xenon -t $SCH ./run.sh $SCH $BAM $SEQIDS
Loading

0 comments on commit aad71ff

Please sign in to comment.