0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make variables provided to docker environment variables.

Browse source 
Currently they are only regular variables passed to a script, so they are not picked up by cmake as expected.
This commit is contained in:
Pentarctagon 2020-02-07 08:24:09 -06:00 • committed by Pentarctagon
parent 656737e6c9
commit 84d88e97e3
2 changed files with 3 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
utils/travis/docker_run.sh
View file

@ -11,22 +11,6 @@ die() { error "$*"; exit 1; }
export DISPLAY=:99.0 export DISPLAY=:99.0
/sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1024x768x24 /sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1024x768x24
# name the parameters
NLS="$1"
TOOL="$2"
CC="$3"
CXX="$4"
CXXSTD="$5"
OPT="$6"
WML_TESTS="$7"
WML_TEST_TIME="$8"
PLAY_TEST="$9"
MP_TEST="${10}"
BOOST_TEST="${11}"
LTO="${12}"
SAN="${13}"
VALIDATE="${14}"
if [ "$OPT" == "-O0" ]; then if [ "$OPT" == "-O0" ]; then
STRICT="true" STRICT="true"
build_timeout=35 build_timeout=35

5
utils/travis/steps/script.sh
View file

@ -58,10 +58,11 @@ elif [ "$TRAVIS_OS_NAME" = "windows" ]; then
else else
# additional permissions required due to flatpak's use of bubblewrap # additional permissions required due to flatpak's use of bubblewrap
docker run --cap-add=ALL --privileged \ docker run --cap-add=ALL --privileged \
--env SFTP_PASSWORD --env LTS --env TRAVIS_COMMIT --env BRANCH --env UPLOAD_ID --env TRAVIS_PULL_REQUEST \ --env SFTP_PASSWORD --env LTS --env TRAVIS_COMMIT --env BRANCH --env UPLOAD_ID --env TRAVIS_PULL_REQUEST --env NLS --env CC --env CXX --env TOOL \
--env CXXSTD --env OPT --env WML_TESTS --env WML_TEST_TIME --env PLAY_TEST --env MP_TEST --env BOOST_TEST --env LTO --env SAN --env VALIDATE \
--volume "$HOME"/build-cache:/home/wesnoth-travis/build \ --volume "$HOME"/build-cache:/home/wesnoth-travis/build \
--volume "$HOME"/flatpak-cache:/home/wesnoth-travis/flatpak-cache \ --volume "$HOME"/flatpak-cache:/home/wesnoth-travis/flatpak-cache \
--volume "$HOME"/.ccache:/root/.ccache \ --volume "$HOME"/.ccache:/root/.ccache \
--tty wesnoth-repo:"$LTS"-"$BRANCH" \ --tty wesnoth-repo:"$LTS"-"$BRANCH" \
unbuffer ./utils/travis/docker_run.sh "$NLS" "$TOOL" "$CC" "$CXX" "$CXXSTD" "$OPT" "$WML_TESTS" "$WML_TEST_TIME" "$PLAY_TEST" "$MP_TEST" "$BOOST_TEST" "$LTO" "$SAN" "$VALIDATE" unbuffer ./utils/travis/docker_run.sh
fi fi