Bitmessage/buildbot-scripts
3
0
Fork 2
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Compare commits

base: Bitmessage:be2aadb276175f314186ca5d49a31e5a9178ee3c
Branches Tags
Bitmessage:master
...
compare: Bitmessage:a1dfb3442a56f1516deae8e1b07f4374493254bc
Branches Tags
Bitmessage:master

2 Commits
be2aadb276 ... a1dfb3442a

Author SHA1 Message Date
Peter Surda
a1dfb3442a
travis2bash python options fix 2021-02-14 11:59:12 +01:00
Peter Surda
829e05599a
Add US locale to bionic Dockerfile 2021-02-14 11:58:35 +01:00
2 changed files with 12 additions and 2 deletions
Show Stats Expand all files Collapse all files

4
docker/bionic/Dockerfile
View File

@ -60,6 +60,10 @@ RUN apt-get install -yq --no-install-suggests --no-install-recommends \
build-essential libcap-dev tor build-essential libcap-dev tor
# locales
RUN apt-get install -yq --no-install-suggests --no-install-recommends \
language-pack-en
# cleanup # cleanup
RUN rm -rf /var/lib/apt/lists/* RUN rm -rf /var/lib/apt/lists/*

8
travis2bash.sh
View File

@ -161,8 +161,10 @@ if [[ "$(declare -p travis_python)" =~ "declare -a" ]]; then
# strip quotes # strip quotes
temp="${pv%\"}" temp="${pv%\"}"
pv="${temp#\"}" pv="${temp#\"}"
# strip crap
options=$(echo "$pv"|cut -d_ -f2-) options=$(echo "$pv"|cut -d_ -f2-)
if [ "$options" == "$pv" ]; then
unset options
fi
if [[ "$options" == with* ]]; then if [[ "$options" == with* ]]; then
options="--$(echo "$options"|cut -d_ -f2-|tr -- '_' '-')" options="--$(echo "$options"|cut -d_ -f2-|tr -- '_' '-')"
fi fi
@ -176,7 +178,11 @@ if [[ "$(declare -p travis_python)" =~ "declare -a" ]]; then
sudo apt -y install "python$pv" "python${pv}-dev" sudo apt -y install "python$pv" "python${pv}-dev"
#fi #fi
if [ -n "$options" ]; then
virtualenv_init "$ppath" "$pv" "$options" virtualenv_init "$ppath" "$pv" "$options"
else
virtualenv_init "$ppath" "$pv"
fi
virtualenv_activate "$pv" virtualenv_activate "$pv"
python_run "$ppath" "$pv" python_run "$ppath" "$pv"
deactivate deactivate