From 5f203665042eab0948cd15a25b8ffe7b6d2d3868 Mon Sep 17 00:00:00 2001 From: Ed Morley <501702+edmorley@users.noreply.github.com> Date: Mon, 24 May 2021 11:16:02 +0100 Subject: [PATCH] Remove redundant "Cedar-14 is unsupported" error Since the Cedar-14 stack build system no longer exists, so this code will never be run. Closes GUS-W-9310936. --- CHANGELOG.md | 1 + bin/compile | 12 ------------ 2 files changed, 1 insertion(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f91dc13bb..d26a39b1f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ - Django collectstatic is no longer skipped if `DISABLE_COLLECTSTATIC` is set to `0` or the empty string ([#1208](https://github.com/heroku/heroku-buildpack-python/pull/1208)). - If Django collectstatic is skipped, output the reason why ([#1208](https://github.com/heroku/heroku-buildpack-python/pull/1208)). - Output a deprecation warning when collectstatic is skipped via the `.heroku/collectstatic_disabled` file ([#1208](https://github.com/heroku/heroku-buildpack-python/pull/1208)). +- Remove redundant "Cedar-14 is unsupported" error ([#1212](https://github.com/heroku/heroku-buildpack-python/pull/1212)). ## v195 (2021-05-03) diff --git a/bin/compile b/bin/compile index 7d5817943..fe9ea1be5 100755 --- a/bin/compile +++ b/bin/compile @@ -90,18 +90,6 @@ source "$BIN_DIR/utils" # shellcheck source=bin/warnings source "$BIN_DIR/warnings" -if [[ "${STACK}" == "cedar-14" ]]; then - mcount "failure.unsupported.cedar-14" - puts-warn "The Cedar-14 stack is no longer supported by the latest release of this buildpack." - puts-warn - puts-warn "Please switch to the Cedar-14 support branch by using this buildpack URL:" - puts-warn "https://github.com/heroku/heroku-buildpack-python#cedar-14" - puts-warn - puts-warn "For instructions on how to change the buildpacks used by an app, see:" - puts-warn "https://devcenter.heroku.com/articles/buildpacks#setting-a-buildpack-on-an-application" - exit 1 -fi - if [[ -f "${ENV_DIR}/BUILD_WITH_GEO_LIBRARIES" ]]; then mcount "failure.unsupported.BUILD_WITH_GEO_LIBRARIES" puts-warn "The Python buildpack's legacy BUILD_WITH_GEO_LIBRARIES functonality is"