From 06694bba18532a13de4671c34e7babc4cf0b8743 Mon Sep 17 00:00:00 2001 From: Casey Faist Date: Tue, 10 Sep 2019 18:29:04 -0700 Subject: [PATCH] simplify pr for review, pull out staged binaries tooling --- Makefile | 11 ----------- bin/compile | 8 -------- 2 files changed, 19 deletions(-) diff --git a/Makefile b/Makefile index 53f9a97..abc769b 100644 --- a/Makefile +++ b/Makefile @@ -8,17 +8,6 @@ check: @shellcheck -x bin/steps/collectstatic bin/steps/eggpath-fix bin/steps/eggpath-fix2 bin/steps/gdal bin/steps/geo-libs bin/steps/mercurial bin/steps/nltk bin/steps/pip-install bin/steps/pip-uninstall bin/steps/pipenv bin/steps/pipenv-python-version bin/steps/pylibmc bin/steps/python @shellcheck -x bin/steps/hooks/* -test-staging: - @echo "Running tests against staged binaries (cedar-14)..." - @docker run -v $(shell pwd):/buildpack:ro --rm -it -e "STACK=cedar-14" -e "TEST_STAGED_S3_BINARIES=1" heroku/cedar-14 bash -c 'cp -r /buildpack /buildpack_test; cd /buildpack_test/; test/run;' - @echo "" - @echo "Running tests against staged binaries (heroku-16)..." - @docker run -v $(shell pwd):/buildpack:ro --rm -it -e "STACK=heroku-16" -e "TEST_STAGED_S3_BINARIES=1" heroku/heroku:16-build bash -c 'cp -r /buildpack /buildpack_test; cd /buildpack_test/; test/run;' - @echo "" - @echo "Running tests against staged binaries (heroku-18)..." - @docker run -v $(shell pwd):/buildpack:ro --rm -it -e "STACK=heroku-18" -e "TEST_STAGED_S3_BINARIES=1" heroku/heroku:18-build bash -c 'cp -r /buildpack /buildpack_test; cd /buildpack_test/; test/run;' - @echo "" - test-cedar-14: @echo "Running tests in docker (cedar-14)..." @docker run -v $(shell pwd):/buildpack:ro --rm -it -e "STACK=cedar-14" heroku/cedar-14 bash -c 'cp -r /buildpack /buildpack_test; cd /buildpack_test/; test/run;' diff --git a/bin/compile b/bin/compile index 9d0453a..6e49277 100755 --- a/bin/compile +++ b/bin/compile @@ -44,14 +44,6 @@ if [[ -n ${BUILDPACK_VENDOR_URL:-} ]]; then VENDOR_URL="$BUILDPACK_VENDOR_URL" fi -# Build binaries (python runtimes, etc) in the /staging/ directory on S3. Test -# these binaries for compatibility when passed this environment variable. -if [ "$TEST_STAGED_S3_BINARIES" == "1" ]; then - echo "Testing staged binaries..." - VENDOR_URL="https://lang-python.s3.amazonaws.com/staging/$STACK" -fi -export VENDOR_URL - # Default Python Versions # shellcheck source=bin/default_pythons source "$BIN_DIR/default_pythons"