Unverified Commit df18c048 authored by Casey's avatar Casey Committed by GitHub

Merge branch 'master' into fix-pipenv-install-twice-ci

parents 629ab233 fe6a81d5
name: Check Changelog
on: [pull_request]
jobs:
build:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v1
- name: Check that CHANGELOG is touched
run: |
cat $GITHUB_EVENT_PATH | jq .pull_request.title | grep -i '[((changelog skip)|(ci skip))]' || git diff remotes/origin/${{ github.base_ref }} --name-only | grep CHANGELOG.md
...@@ -2,7 +2,9 @@ ...@@ -2,7 +2,9 @@
# Master # Master
Bug fix: pipenv no longer installs twice on CI - Bug fix: pipenv no longer installs twice on CI
- Unpin Heroku-18 binary build deps
- Typo fixes
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
......
...@@ -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
......
...@@ -7,7 +7,7 @@ ENV WORKSPACE_DIR="/app/builds" \ ...@@ -7,7 +7,7 @@ ENV WORKSPACE_DIR="/app/builds" \
DEBIAN_FRONTEND=noninteractive \ DEBIAN_FRONTEND=noninteractive \
STACK="heroku-18" STACK="heroku-18"
RUN apt-get update && apt-get install --no-install-recommends -y python-pip-whl=9.0.1-2 python-pip=9.0.1-2 python-setuptools python-wheel && rm -rf /var/lib/apt/lists/* RUN apt-get update && apt-get install -y python-pip && rm -rf /var/lib/apt/lists/*
COPY requirements.txt /app/ COPY requirements.txt /app/
RUN pip install --disable-pip-version-check --no-cache-dir -r /app/requirements.txt RUN pip install --disable-pip-version-check --no-cache-dir -r /app/requirements.txt
......
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