Skip to content

Commit df18c04

Browse files
authored
Merge branch 'master' into fix-pipenv-install-twice-ci
2 parents 629ab23 + fe6a81d commit df18c04

File tree

4 files changed

+17
-3
lines changed

4 files changed

+17
-3
lines changed

.github/workflows/check_changelog.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
name: Check Changelog
2+
3+
on: [pull_request]
4+
5+
jobs:
6+
build:
7+
runs-on: ubuntu-latest
8+
steps:
9+
- uses: actions/checkout@v1
10+
- name: Check that CHANGELOG is touched
11+
run: |
12+
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

CHANGELOG.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,9 @@
22

33
# Master
44

5-
Bug fix: pipenv no longer installs twice on CI
5+
- Bug fix: pipenv no longer installs twice on CI
6+
- Unpin Heroku-18 binary build deps
7+
- Typo fixes
68

79
--------------------------------------------------------------------------------
810

bin/steps/pip-uninstall

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ if [ ! "$SKIP_PIP_INSTALL" ]; then
1313

1414

1515
if ! pip-diff --stale requirements-declared.txt requirements.txt --exclude setuptools pip wheel > .heroku/python/requirements-stale.txt; then
16-
mount "failure.bad-requirements"
16+
mcount "failure.bad-requirements"
1717
fi
1818

1919
rm -fr requirements-declared.txt

builds/heroku-18.Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ ENV WORKSPACE_DIR="/app/builds" \
77
DEBIAN_FRONTEND=noninteractive \
88
STACK="heroku-18"
99

10-
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/*
10+
RUN apt-get update && apt-get install -y python-pip && rm -rf /var/lib/apt/lists/*
1111

1212
COPY requirements.txt /app/
1313
RUN pip install --disable-pip-version-check --no-cache-dir -r /app/requirements.txt

0 commit comments

Comments
 (0)