diff --git a/.travis.yml b/.travis.yml index c6c1b47b354bc4269300e2780bfa386b2a378be8..3ea83b8c7a3ad56812a41eea38182e64d57975b3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,25 +1,23 @@ language: bash -# sudo: required -addons: - apt: - sources: - - debian-sid # Grab shellcheck from the Debian repo (o_O) - packages: - - shellcheck -services: - - docker -# install: docker pull heroku/cedar:14 +dist: trusty jobs: include: - stage: "Bash linting (shellcheck)" + sudo: false + addons: + apt: + sources: + - debian-sid # Grab shellcheck from the Debian repo (o_O) + packages: + - shellcheck script: make check - - stage: "Heroku-16 Stack Tests" + - stage: "Stack Tests" + services: docker + env: STACK=heroku-16 script: ./tests.sh - env: - - STACK=heroku-16 - - stage: "Cedar-14 Stack Tests" + - stage: "Stack Tests" + services: docker + env: STACK=cedar-14 script: ./tests.sh - env: - - STACK=cedar-14 \ No newline at end of file diff --git a/bin/steps/pip-install b/bin/steps/pip-install index ee7e3589d673f651bcfb10f937e70972df8f6ef4..d0941f2a7f85bb1ec8368967c784050e6a121c96 100755 --- a/bin/steps/pip-install +++ b/bin/steps/pip-install @@ -6,7 +6,7 @@ if [ ! "$SKIP_PIP_INSTALL" ]; then puts-step "Installing requirements with pip" set +e - /app/.heroku/python/bin/pip install -r "$BUILD_DIR/requirements.txt" --exists-action=w --src=/app/.heroku/src --disable-pip-version-check --no-cache-dir 2>&1 | tee "$WARNINGS_LOG" | cleanup | indent + sub-env /app/.heroku/python/bin/pip install -r "$BUILD_DIR/requirements.txt" --exists-action=w --src=/app/.heroku/src --disable-pip-version-check --no-cache-dir 2>&1 | tee "$WARNINGS_LOG" | cleanup | indent PIP_STATUS="${PIPESTATUS[0]}" set -e @@ -22,4 +22,4 @@ if [ ! "$SKIP_PIP_INSTALL" ]; then /app/.heroku/python/bin/pip freeze --disable-pip-version-check > .heroku/python/requirements-installed.txt echo -fi \ No newline at end of file +fi diff --git a/bin/steps/pipenv b/bin/steps/pipenv index 23032ade06a85340f7a30c99ba1e847d027f9a4d..6ccd3eed6fb3cdb480b7b34e31b9b4ef3c373dea 100644 --- a/bin/steps/pipenv +++ b/bin/steps/pipenv @@ -18,4 +18,4 @@ if [[ -f Pipfile ]]; then /app/.heroku/python/bin/pip freeze > requirements.txt fi -fi \ No newline at end of file +fi diff --git a/bin/utils b/bin/utils index 59273a7c49124c231dd9fdbbc2a3c55b25062199..4a06a4697a61ad4b71ab7e223c77f6120be628cb 100755 --- a/bin/utils +++ b/bin/utils @@ -72,7 +72,7 @@ sub-env() { done fi - $1 + "$@" ) } diff --git a/vendor/WEB_CONCURRENCY.sh b/vendor/WEB_CONCURRENCY.sh index 69a562a9b497bec85f99bd5cf8d71270d9eb6efe..f1a23ee9e1077f495ee3fed7dc4884f56ba5e7a6 100755 --- a/vendor/WEB_CONCURRENCY.sh +++ b/vendor/WEB_CONCURRENCY.sh @@ -5,25 +5,25 @@ case $(ulimit -u) in # Standard-1X (+Free, +Hobby) Dyno 256) export DYNO_RAM=512 - export WEB_CONCURRENCY=${WEB_CONCURRENCY:-02} + export WEB_CONCURRENCY=${WEB_CONCURRENCY:-2} ;; # Standard-2X Dyno 512) export DYNO_RAM=1024 - export WEB_CONCURRENCY=${WEB_CONCURRENCY:-04} + export WEB_CONCURRENCY=${WEB_CONCURRENCY:-4} ;; # Performance-M Dyno 16384) export DYNO_RAM=2560 - export WEB_CONCURRENCY=${WEB_CONCURRENCY:-08} + export WEB_CONCURRENCY=${WEB_CONCURRENCY:-8} ;; # Performance-L Dyno 32768) - export DYNO_RAM=6656 - export WEB_CONCURRENCY=${WEB_CONCURRENCY:-011} + export DYNO_RAM=14336 + export WEB_CONCURRENCY=${WEB_CONCURRENCY:-11} ;; -esac \ No newline at end of file +esac