diff --git a/Jenkinsfile b/Jenkinsfile index 631991f..174d186 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -15,6 +15,7 @@ pipeline { agent none environment { DEBUG = "1" + HEADLESS = "1" } options { buildDiscarder logRotator(numToKeepStr: '4') } stages { @@ -40,7 +41,7 @@ pipeline { axes { axis { name 'COMP_OPTS'; - values 'OPT=0 LTO=OFF STATIC=OFF', 'OPT=2 LTO=OFF STATIC=ON', 'OPT=3 LTO=ON STATIC=ON PGO=ON' + values 'OPT=0 LTO=OFF STATIC=OFF', 'OPT=2 LTO=OFF', 'PGO=ON' } } stages { @@ -61,7 +62,7 @@ pipeline { axis { name 'DISTRO'; values 'ubuntu', 'fedora', 'debian', 'archlinux' } axis { name 'COMP_OPTS'; - values 'OPT=0 LTO=OFF STATIC=OFF', 'OPT=2 LTO=OFF STATIC=ON', 'OPT=3 LTO=ON STATIC=ON PGO=ON' + values 'OPT=0 LTO=OFF STATIC=OFF', 'OPT=2 LTO=OFF', 'PGO=ON' } } stages { diff --git a/lib/0-utils.sh b/lib/0-utils.sh index 8bf5aae..9b496ca 100644 --- a/lib/0-utils.sh +++ b/lib/0-utils.sh @@ -357,6 +357,9 @@ spinner() { start) test -f "${spinPidFile}" && rm "${spinPidFile}" + # don't want to clutter logs if running headless + test "${HEADLESS}" == '1' && return + _start_spinner & echo $! >"${spinPidFile}" ;; diff --git a/lib/compile_opts.sh b/lib/compile_opts.sh index f74cc02..c8872d8 100644 --- a/lib/compile_opts.sh +++ b/lib/compile_opts.sh @@ -41,7 +41,6 @@ libx264 \ libx265 \ libwebp \ libvpx \ -libass \ libvorbis \ libmp3lame\ " diff --git a/lib/docker.sh b/lib/docker.sh index 92c4d61..ef5ae67 100644 --- a/lib/docker.sh +++ b/lib/docker.sh @@ -19,6 +19,7 @@ set_docker_run_flags() { -v "${REPO_DIR}:${REPO_DIR}" -w "${REPO_DIR}" -e "DEBUG=${DEBUG}" + -e "HEADLESS=${HEADLESS}" -t ) for opt in "${FB_COMP_OPTS[@]}"; do