diff options
Diffstat (limited to 'tools/ci-build.sh')
| -rwxr-xr-x | tools/ci-build.sh | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/tools/ci-build.sh b/tools/ci-build.sh index d6951cb8..bfb60726 100755 --- a/tools/ci-build.sh +++ b/tools/ci-build.sh @@ -79,8 +79,8 @@ init_wine() { # ci_distro: # OS distribution in which we are testing -# Typical values: ubuntu, debian; maybe fedora in future -: "${ci_distro:=ubuntu}" +# Typical values: auto (detect at runtime), ubuntu, debian; maybe fedora in future +: "${ci_distro:=auto}" # ci_docker: # If non-empty, this is the name of a Docker image. ci-install.sh will @@ -132,6 +132,12 @@ init_wine() { echo "ci_buildsys=$ci_buildsys ci_distro=$ci_distro ci_docker=$ci_docker ci_host=$ci_host ci_local_packages=$ci_local_packages ci_parallel=$ci_parallel ci_suite=$ci_suite ci_test=$ci_test ci_test_fatal=$ci_test_fatal ci_variant=$ci_variant ci_runtime=$ci_runtime $0" +# choose distribution +if [ "$ci_distro" = "auto" ]; then + ci_distro=$(. /etc/os-release; echo ${ID} | sed 's, ,_,g') + echo "detected ci_distro as '${ci_distro}'" +fi + if [ -n "$ci_docker" ]; then exec docker run \ --env=ci_buildsys="${ci_buildsys}" \ @@ -366,7 +372,7 @@ case "$ci_buildsys" in # enable tests if supported if [ "$ci_test" = yes ]; then # choose correct wine architecture - if [ "${ci_distro}" = opensuse ]; then + if [ "${ci_distro%%-*}" = opensuse ]; then if [ "${ci_host%%-*}" = x86_64 ]; then export WINEARCH=win64 cmake=mingw64-cmake |