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.

Sign up for GitHub

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

verify that docker script reached its end #454

Merged
merged 3 commits into from
Feb 19, 2017
Merged

verify that docker script reached its end #454

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4ef3b65
verify that docker script reached its end
minrk Feb 8, 2017
2cfc941
exit 1 instead of ?
minrk Feb 9, 2017
f63e30f
enable echo at the end
minrk Feb 9, 2017
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
10 changes: 9 additions & 1 deletion conda_smithy/templates/run_docker_build.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,14 @@ show_channel_urls: true
CONDARC
)

rm -f "$FEEDSTOCK_ROOT/build_artefacts/conda-forge-build-done"

cat << EOF | docker run -i \
-v "${RECIPE_ROOT}":/recipe_root \
-v "${FEEDSTOCK_ROOT}":/feedstock_root \
-a stdin -a stdout -a stderr \
{{ docker.image }} \
{{ docker.command }} || exit $?
{{ docker.command }} || exit 1

export BINSTAR_TOKEN=${BINSTAR_TOKEN}
export PYTHONUNBUFFERED=1
Expand All @@ -50,5 +52,11 @@ conda build /recipe_root --quiet || exit 1
{%- endfor -%}
{%- endblock -%}

touch /feedstock_root/build_artefacts/conda-forge-build-done
EOF

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missed that we did not include another empty line below. As a result, this means the terminal newline would be dropped from this file. Fixing it in PR ( #459 ).

# double-check that the build got to the end
# see https://github.com/conda-forge/conda-smithy/pull/337
# for a possible fix
set -x
test -f "$FEEDSTOCK_ROOT/build_artefacts/conda-forge-build-done" || exit 1
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

An empty line is added after here in PR ( #459 ) so the re-rendered file has a terminal newline.