Github Actions can't color terminal output. [ci skip]
This commit is contained in:
parent
6b4280d4cf
commit
8e62bb0acb
2 changed files with 10 additions and 16 deletions
6
.github/workflows/ci-scripts/docker.sh
vendored
6
.github/workflows/ci-scripts/docker.sh
vendored
|
@ -20,11 +20,7 @@ scons wesnoth wesnothd campaignd boost_unit_tests build="$CFG" \
|
|||
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
|
||||
|
||||
red=$(tput setaf 1)
|
||||
reset=$(tput sgr0)
|
||||
# print given message in red
|
||||
error() { printf '%s%s%s\n' "$red" "$*" "$reset"; }
|
||||
# print given message and exit
|
||||
error() { printf '%s\n' "$*"; }
|
||||
die() { error "$*"; exit 1; }
|
||||
|
||||
# print given message ($1) and execute given command; sets EXIT_VAL on failure
|
||||
|
|
20
.github/workflows/ci-scripts/ubuntu.sh
vendored
20
.github/workflows/ci-scripts/ubuntu.sh
vendored
|
@ -1,14 +1,14 @@
|
|||
#!/bin/bash
|
||||
|
||||
BRANCH="$1"
|
||||
IMAGE="$2"
|
||||
NLS="$3"
|
||||
TOOL="$4"
|
||||
CC="$5"
|
||||
CXX="$6"
|
||||
CXXSTD="$7"
|
||||
CFG="$8"
|
||||
LTO="$9"
|
||||
export BRANCH="$1"
|
||||
export IMAGE="$2"
|
||||
export NLS="$3"
|
||||
export TOOL="$4"
|
||||
export CC="$5"
|
||||
export CXX="$6"
|
||||
export CXXSTD="$7"
|
||||
export CFG="$8"
|
||||
export LTO="$9"
|
||||
|
||||
echo "Using linux:"
|
||||
echo "BRANCH: $BRANCH"
|
||||
|
@ -21,8 +21,6 @@ echo "CXXSTD: $CXXSTD"
|
|||
echo "CFG: $CFG"
|
||||
echo "LTO: $LTO"
|
||||
|
||||
date
|
||||
|
||||
echo FROM wesnoth/wesnoth:"$IMAGE"-"$BRANCH" > utils/dockerbuilds/travis/Dockerfile-travis-"$IMAGE"-"$BRANCH"
|
||||
echo COPY ./ /home/wesnoth-travis/ >> utils/dockerbuilds/travis/Dockerfile-travis-"$IMAGE"-"$BRANCH"
|
||||
echo WORKDIR /home/wesnoth-travis >> utils/dockerbuilds/travis/Dockerfile-travis-"$IMAGE"-"$BRANCH"
|
||||
|
|
Loading…
Add table
Reference in a new issue