Skip to content

Commit 06694bb

Browse files
committed
simplify pr for review, pull out staged binaries tooling
1 parent 158a3e2 commit 06694bb

File tree

2 files changed

+0
-19
lines changed

2 files changed

+0
-19
lines changed

Makefile

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,6 @@ check:
88
@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
99
@shellcheck -x bin/steps/hooks/*
1010

11-
test-staging:
12-
@echo "Running tests against staged binaries (cedar-14)..."
13-
@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;'
14-
@echo ""
15-
@echo "Running tests against staged binaries (heroku-16)..."
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;'
17-
@echo ""
18-
@echo "Running tests against staged binaries (heroku-18)..."
19-
@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;'
20-
@echo ""
21-
2211
test-cedar-14:
2312
@echo "Running tests in docker (cedar-14)..."
2413
@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;'

bin/compile

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,6 @@ if [[ -n ${BUILDPACK_VENDOR_URL:-} ]]; then
4444
VENDOR_URL="$BUILDPACK_VENDOR_URL"
4545
fi
4646

47-
# Build binaries (python runtimes, etc) in the /staging/ directory on S3. Test
48-
# these binaries for compatibility when passed this environment variable.
49-
if [ "$TEST_STAGED_S3_BINARIES" == "1" ]; then
50-
echo "Testing staged binaries..."
51-
VENDOR_URL="https://lang-python.s3.amazonaws.com/staging/$STACK"
52-
fi
53-
export VENDOR_URL
54-
5547
# Default Python Versions
5648
# shellcheck source=bin/default_pythons
5749
source "$BIN_DIR/default_pythons"

0 commit comments

Comments
 (0)