Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: add scripts which were previously ignored #4240

Merged
merged 2 commits into from
Sep 26, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions packages/aws-cdk/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,5 @@ coverage
.nycrc
.LAST_PACKAGE
*.snk

!test/integ/run-wrappers/dist
4 changes: 1 addition & 3 deletions packages/aws-cdk/test/integ/run-against-dist.bash
Original file line number Diff line number Diff line change
Expand Up @@ -175,8 +175,6 @@ function prepare_python_packages() {
# later which will re-hijack ours with a 'pip' binary. Use a function instead,
# the real logic will reside in "pip_"

ORIGINAL_PIP=$(type -p pip) || { echo "No 'pip' found" >&2; exit 1; }
export ORIGINAL_PIP
export PYTHON_WHEELS=$dist_root/python

if [ ! -d "$PYTHON_WHEELS" ]; then
Expand All @@ -188,5 +186,5 @@ function prepare_python_packages() {
}

function pip() {
exec pip_ "$@"
pip_ "$@"
}
10 changes: 10 additions & 0 deletions packages/aws-cdk/test/integ/run-wrappers/dist/dotnet
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
#!/bin/bash
set -eu
if [[ "${1:-}" == "build" ]]; then
shift
exec $ORIGINAL_DOTNET build \
--source $NUGET_SOURCE \
"$@"
fi

exec $ORIGINAL_DOTNET "$@"
10 changes: 10 additions & 0 deletions packages/aws-cdk/test/integ/run-wrappers/dist/pip_
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
#!/bin/bash
set -eu
if [[ "${1:-}" == "install" ]]; then
# Just install all wheels from the source repository.
# It's too hard to figure out what was actually requested, and
# this is pretty quick anyway.
exec pip install $PYTHON_WHEELS/*.whl
fi

exec pip "$@"