From 43a994245ee6fa0aeb0f1d46acfe1a4f0f865302 Mon Sep 17 00:00:00 2001 From: squidfunk Date: Fri, 24 Feb 2017 19:44:04 +0100 Subject: [PATCH] Restructure install procedure for Travis build --- .travis.yml | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index a7f554a9d..ac173c715 100644 --- a/.travis.yml +++ b/.travis.yml @@ -45,11 +45,10 @@ cache: # Install yarn as Travis doesn't support it out of the box before_install: npm install -g yarn -# Do not install optional dependencies by default -install: yarn install --ignore-optional - # Install dependencies -before_script: pip install --user -r requirements.txt +install: + - yarn install --ignore-optional + - pip install --user -r requirements.txt # Perform build and tests script: yarn run build @@ -69,12 +68,12 @@ matrix: # If we're not on a release branch, exit early and indicate success #before_install: echo "$TRAVIS_BRANCH" | grep -qE "^[0-9.]+$" && exit 0; - - # Don't install anything, as we're only using the pre-built files - install: ":" + # TODO: only for debugging + before_install: TRAVIS_BRANCH_X=1.0.5 # Install wheel for build - before_script: pip install wheel + install: + - pip install wheel # Perform build script: @@ -86,11 +85,11 @@ matrix: # Install twine and push release to PyPI - pip install twine - #- twine upload -u $PYPI_USER -p $PYPI_PASS dist/* + #- twine upload -u $PYPI_USERNAME -p $PYPI_PASSWORD dist/* # Push to Docker Hub - - docker login -e $DOCKER_EMAIL -u $DOCKER_USERNAME -p $DOCKER_PASSWORD - - docker tag $TRAVIS_REPO_SLUG $TRAVIS_REPO_SLUG:$TRAVIS_BRANCH + - docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD + - docker tag $TRAVIS_REPO_SLUG $TRAVIS_REPO_SLUG:$TRAVIS_BRANCH_X - docker tag $TRAVIS_REPO_SLUG $TRAVIS_REPO_SLUG:latest - docker push $TRAVIS_REPO_SLUG