diff options
| author | Simon McVittie <smcv@collabora.com> | 2023-01-20 13:46:02 +0000 |
|---|---|---|
| committer | Simon McVittie <smcv@collabora.com> | 2023-01-20 13:46:02 +0000 |
| commit | 4dcd5d38c4d9dc169234e308049a3bebcf01c0de (patch) | |
| tree | f57b8297c1e1c1d59bafbfb6159f2510fbf40621 | |
| parent | 1b7e358da9374c80c1c4d71e859389cc10ebe7b0 (diff) | |
CI: Remove vestigial support for launching our own Docker container
This was only useful on Travis-CI.
Signed-off-by: Simon McVittie <smcv@collabora.com>
| -rw-r--r-- | tools/ci-Dockerfile.in | 12 | ||||
| -rwxr-xr-x | tools/ci-build.sh | 13 | ||||
| -rwxr-xr-x | tools/ci-install.sh | 16 |
3 files changed, 0 insertions, 41 deletions
diff --git a/tools/ci-Dockerfile.in b/tools/ci-Dockerfile.in deleted file mode 100644 index 83e1d86..0000000 --- a/tools/ci-Dockerfile.in +++ /dev/null @@ -1,12 +0,0 @@ -# Copyright 2006-2022 Collabora Ltd. -# SPDX-License-Identifier: MIT -FROM @ci_docker@ -ENV container docker - -ADD tools/ci-install.sh /ci-install.sh -RUN ci_suite="@ci_suite@" ci_distro="@ci_distro@" ci_in_docker=yes dbus_ci_system_python="@dbus_ci_system_python@" /ci-install.sh - -ADD . /home/user/ci -RUN chown -R user:user /home/user/ci -WORKDIR /home/user/ci -USER user diff --git a/tools/ci-build.sh b/tools/ci-build.sh index 23392f6..3781fa7 100755 --- a/tools/ci-build.sh +++ b/tools/ci-build.sh @@ -35,19 +35,6 @@ if [ -z "$dbus_ci_parallel" ]; then dbus_ci_parallel=2 fi -if [ -n "$ci_docker" ]; then - exec docker run \ - --env=ci_distro="${ci_distro}" \ - --env=ci_docker="" \ - --env=ci_suite="${ci_suite}" \ - --env=dbus_ci_parallel="${dbus_ci_parallel}" \ - --env=dbus_ci_system_python="${dbus_ci_system_python-}" \ - --privileged \ - ci-image \ - tools/ci-build.sh \ - "$@" -fi - if [ -n "$dbus_ci_system_python" ]; then # Reset to standard paths to use the Ubuntu version of python unset LDFLAGS diff --git a/tools/ci-install.sh b/tools/ci-install.sh index 2aee6dc..c3b34a3 100755 --- a/tools/ci-install.sh +++ b/tools/ci-install.sh @@ -34,12 +34,6 @@ NULL= # Typical values: ubuntu, debian; maybe fedora in future : "${ci_distro:=debian}" -# ci_docker: -# If non-empty, this is the name of a Docker image. ci-install.sh will -# fetch it with "docker pull" and use it as a base for a new Docker image -# named "ci-image" in which we will do our testing. -: "${ci_docker:=}" - # ci_host: # Either "native", or an Autoconf --host argument to cross-compile # the package (not currently supported for dbus-python) @@ -64,16 +58,6 @@ fi have_system_meson= -if [ -n "$ci_docker" ]; then - sed \ - -e "s/@ci_distro@/${ci_distro}/" \ - -e "s/@ci_docker@/${ci_docker}/" \ - -e "s/@ci_suite@/${ci_suite}/" \ - -e "s/@dbus_ci_system_python@/${dbus_ci_system_python-}/" \ - < tools/ci-Dockerfile.in > Dockerfile - exec docker build -t ci-image . -fi - if [ -n "${dbus_ci_system_python-}" ]; then if [ -z "${dbus_ci_system_python_module_suffix-}" ]; then case "$dbus_ci_system_python}" in |