Skip to content
Snippets Groups Projects
Commit 0327ce5c authored by Jan Tattermusch's avatar Jan Tattermusch
Browse files

Merge pull request #2390 from nicolasnoble/we-have-both-kinds

Enabling 32 bits downgrade of our environment.
parents 58ff670f b8c15247
No related branches found
No related tags found
No related merge requests found
...@@ -42,4 +42,4 @@ cd /var/local/git/grpc ...@@ -42,4 +42,4 @@ cd /var/local/git/grpc
nvm use 0.12 nvm use 0.12
rvm use ruby-2.1 rvm use ruby-2.1
tools/run_tests/prepare_travis.sh tools/run_tests/prepare_travis.sh
tools/run_tests/run_tests.py -t -c $config -l $language -x report.xml $arch tools/run_tests/run_tests.py -t -c $config -l $language -x report.xml
...@@ -37,6 +37,16 @@ ...@@ -37,6 +37,16 @@
# NOTE: No empty lines should appear in this file before igncr is set! # NOTE: No empty lines should appear in this file before igncr is set!
set -ex -o igncr || set -ex set -ex -o igncr || set -ex
# Grabbing the machine's architecture
arch=`uname -m`
case $platform in
i386)
arch="i386"
platform="linux"
;;
esac
if [ "$platform" == "linux" ] if [ "$platform" == "linux" ]
then then
echo "building $language on Linux" echo "building $language on Linux"
...@@ -61,6 +71,7 @@ then ...@@ -61,6 +71,7 @@ then
docker run \ docker run \
-e "config=$config" \ -e "config=$config" \
-e "language=$language" \ -e "language=$language" \
-e "arch=$arch" \
-i \ -i \
-v "$git_root:/var/local/jenkins/grpc" \ -v "$git_root:/var/local/jenkins/grpc" \
--cidfile=docker.cid \ --cidfile=docker.cid \
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment