M-Labs/compiler-builtins-zynq
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

really install curl inside docker

Browse Source
This commit is contained in:
Jorge Aparicio 2016-08-08 21:27:08 -05:00
parent a633b0cba3
commit 4b453fbd0a
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ci/env.sh
View File

@ -29,6 +29,7 @@ case $TARGET in
export QEMU_LD_PREFIX=/usr/powerpc-linux-gnu export QEMU_LD_PREFIX=/usr/powerpc-linux-gnu
;; ;;
powerpc64le-unknown-linux-gnu) powerpc64le-unknown-linux-gnu)
# NOTE $DOCKER values: 'y' (yes, call docker), 'i' (inside a docker container) or 'n' ("no)
if [[ -z $DOCKER ]]; then if [[ -z $DOCKER ]]; then
export DOCKER=y export DOCKER=y
fi fi

2
ci/install.sh
View File

@ -3,7 +3,7 @@ set -ex
. $(dirname $0)/env.sh . $(dirname $0)/env.sh
install_deps() { install_deps() {
if [[ ${DOCKER} == "y" ]]; then if [[ ${DOCKER} == "i" ]]; then
apt-get install -y --no-install-recommends \ apt-get install -y --no-install-recommends \
ca-certificates curl ca-certificates curl
fi fi

2
ci/script.sh
View File

@ -34,7 +34,7 @@ inspect() {
main() { main() {
if [[ $DOCKER == "y" ]]; then if [[ $DOCKER == "y" ]]; then
docker run \ docker run \
-e DOCKER=n \ -e DOCKER=i \
-e TARGET=$TARGET \ -e TARGET=$TARGET \
-e TRAVIS_OS_NAME=$TRAVIS_OS_NAME \ -e TRAVIS_OS_NAME=$TRAVIS_OS_NAME \
-v $(pwd):/mnt \ -v $(pwd):/mnt \