Unverified Commit 2be890d2 authored by Casey's avatar Casey Committed by GitHub

Merge branch 'master' into schneems/check-changelog-fix-escaping

parents 30962991 ffc7359b
...@@ -2,6 +2,8 @@ ...@@ -2,6 +2,8 @@
# Master # Master
- Typo fixes
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
# 156 (2019-09-12) # 156 (2019-09-12)
......
...@@ -13,7 +13,7 @@ if [ ! "$SKIP_PIP_INSTALL" ]; then ...@@ -13,7 +13,7 @@ if [ ! "$SKIP_PIP_INSTALL" ]; then
if ! pip-diff --stale requirements-declared.txt requirements.txt --exclude setuptools pip wheel > .heroku/python/requirements-stale.txt; then if ! pip-diff --stale requirements-declared.txt requirements.txt --exclude setuptools pip wheel > .heroku/python/requirements-stale.txt; then
mount "failure.bad-requirements" mcount "failure.bad-requirements"
fi fi
rm -fr requirements-declared.txt rm -fr requirements-declared.txt
......
FROM heroku/heroku:18-build FROM heroku/heroku:18-build.v16
WORKDIR /app WORKDIR /app
ENV WORKSPACE_DIR="/app/builds" \ ENV WORKSPACE_DIR="/app/builds" \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment