Skip to content

Commit

Permalink
Merge branch 'master' into ct-run-pipe-from-conda
Browse files Browse the repository at this point in the history
  • Loading branch information
tomkinsc authored Jul 19, 2018
2 parents d5eab95 + 36bfcc6 commit a3b3914
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion travis/build-conda.sh
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,6 @@ else

# render and build the conda package
python packaging/conda-recipe/render-recipe.py "$CONDA_PKG_VERSION" --package-name "viral-ngs-dev" --download-filename "$TRAVIS_COMMIT" --build-reqs requirements-conda.txt --run-reqs requirements-conda.txt --py3-run-reqs requirements-py3.txt --py2-run-reqs requirements-py2.txt --test-reqs requirements-conda-tests.txt
CONDA_PERL=5.22.0 conda build -c broad-viral -c r -c bioconda -c conda-forge -c defaults --python "$TRAVIS_PYTHON_VERSION" --token "$ANACONDA_TOKEN" --output-folder "$CONDA_PACKAGE_OUTDIR" packaging/conda-recipe/viral-ngs
CONDA_PERL=5.22.0 conda build --no-anaconda-upload -c broad-viral -c r -c bioconda -c conda-forge -c defaults --python "$TRAVIS_PYTHON_VERSION" --token "$ANACONDA_TOKEN" --output-folder "$CONDA_PACKAGE_OUTDIR" packaging/conda-recipe/viral-ngs

fi

0 comments on commit a3b3914

Please sign in to comment.