From e84885396805c078a5bb456a7f4dd85e89fcfafc Mon Sep 17 00:00:00 2001 From: iphydf Date: Sun, 2 Jan 2022 19:41:46 +0000 Subject: [PATCH] chore: Remove old travis docker scripts. These aren't useful anymore. We don't have travis anymore, so there's no need to simulate the travis CI environment. --- other/docker/cmake/Dockerfile | 14 -------- other/docker/run-ci | 21 ----------- other/docker/travis/Dockerfile | 65 ---------------------------------- 3 files changed, 100 deletions(-) delete mode 100644 other/docker/cmake/Dockerfile delete mode 100755 other/docker/run-ci delete mode 100644 other/docker/travis/Dockerfile diff --git a/other/docker/cmake/Dockerfile b/other/docker/cmake/Dockerfile deleted file mode 100644 index 0b70a9f7..00000000 --- a/other/docker/cmake/Dockerfile +++ /dev/null @@ -1,14 +0,0 @@ -################################################ -# cmake-linux -FROM localbuild/travis:1.0.0 - -# Copy minimal files to run "cmake-linux install", so we can avoid rebuilding -# astyle and other things when only source files change. -RUN mkdir -p /home/travis/build/c-toxcore /home/travis/cache -WORKDIR /home/travis/build/c-toxcore -COPY --chown=travis:travis c-toxcore/.travis/ /home/travis/build/c-toxcore/.travis/ -RUN .travis/cmake-linux install - -# Now copy the rest of the sources and run the build. -COPY --chown=travis:travis . /home/travis/build/ -RUN .travis/cmake-linux script diff --git a/other/docker/run-ci b/other/docker/run-ci deleted file mode 100755 index a42c11eb..00000000 --- a/other/docker/run-ci +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash - -set -eux - -STAGE="${1-cmake}" - -readarray -t FILES <<<"$(git ls-files | sed -e 's,^,c-toxcore/,')" - -FILES+=(c-toxcore/.git) - -if [ -f .git ]; then - FILES+=(.git/modules/c-toxcore) -fi - -cd .. -tar -c "${FILES[@]}" | - docker build -f "c-toxcore/other/docker/travis/Dockerfile" \ - -t localbuild/travis:1.0.0 - -tar -c "${FILES[@]}" | - docker build -f "c-toxcore/other/docker/$STAGE/Dockerfile" \ - -t "localbuild/$STAGE:1.0.0" - diff --git a/other/docker/travis/Dockerfile b/other/docker/travis/Dockerfile deleted file mode 100644 index 96bfdab4..00000000 --- a/other/docker/travis/Dockerfile +++ /dev/null @@ -1,65 +0,0 @@ -# This Docker build emulates roughly what Travis CI is doing. It is not exactly -# the same (different tool versions) and success in this image may not -# necessarily mean success on Travis. This image is also not automatically -# tested, so it may get out of date. Send PRs if you use it and it's broken. -# -# For one, we use bionic, not xenial, because xenial's clang is way too old. -FROM ubuntu:16.04 - -# Travis environment. -RUN apt-get update && apt-get install --no-install-recommends -y \ - apt-transport-https \ - build-essential \ - ca-certificates \ - curl \ - git \ - pkg-config \ - python-pip \ - python-setuptools \ - python3 \ - software-properties-common \ - wget \ - && apt-get clean \ - && rm -rf /var/lib/apt/lists/* - -SHELL ["/bin/bash", "-o", "pipefail", "-c"] -RUN curl https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - \ - && apt-add-repository "deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-6.0 main" \ - && apt-get update && apt-get install --no-install-recommends -y \ - clang-6.0 \ - clang-format-6.0 \ - llvm-6.0 \ - && apt-get clean \ - && rm -rf /var/lib/apt/lists/* - -RUN ls /usr/bin/clang-6.0 && ln -s /usr/bin/clang-6.0 /usr/bin/clang \ - && ls /usr/bin/clang++-6.0 && ln -s /usr/bin/clang++-6.0 /usr/bin/clang++ \ - && ls /usr/bin/clang-format-6.0 && ln -s /usr/bin/clang-format-6.0 /usr/bin/clang-format \ - && ls /usr/bin/opt-6.0 && ln -s /usr/bin/opt-6.0 /usr/bin/opt - -# Bionic's cmake is too old. -RUN pip install --upgrade pip cmake - -# .travis.yml -RUN apt-get update && apt-get install --no-install-recommends -y \ - libconfig-dev \ - libgtest-dev \ - libopus-dev \ - libsodium-dev \ - libvpx-dev \ - ninja-build \ - pylint3 \ - && apt-get clean \ - && rm -rf /var/lib/apt/lists/* - -# Set up travis user. -RUN groupadd -r -g 1000 travis \ - && useradd --no-log-init -r -g travis -u 1000 travis \ - && mkdir -p /src/workspace /home/travis \ - && chown travis:travis /home/travis -USER travis - -# Set up environment. -ENV CC=gcc CXX=g++ \ -PATH=/home/travis/.local/bin:$PATH \ -TRAVIS_REPO_SLUG=TokTok/c-toxcore