This commit is contained in:
Simon Sapin 2018-09-18 19:05:59 +02:00
parent 5e08c83387
commit e5902fed9b
2 changed files with 57 additions and 46 deletions

View file

@ -12,51 +12,61 @@ ENV \
# https://stackoverflow.com/questions/44331836/apt-get-install-tzdata-noninteractive # https://stackoverflow.com/questions/44331836/apt-get-install-tzdata-noninteractive
DEBIAN_FRONTEND=noninteractive DEBIAN_FRONTEND=noninteractive
RUN apt-get update -q && apt-get install -qy --no-install-recommends \ RUN \
# apt-get update -q && \
# Cloning the repository apt-get install -qy --no-install-recommends \
git \ #
ca-certificates \ # Cloning the repository
# git \
# Installing rustup ca-certificates \
curl \ #
# # Installing rustup
# Running mach curl \
python2.7 \ #
python-virtualenv \ # Running mach
virtualenv \ python2.7 \
# python-virtualenv \
# Multiple C/C++ dependencies built from source virtualenv \
g++ \ #
make \ # Multiple C/C++ dependencies built from source
cmake \ g++ \
# make \
# ANGLE cmake \
xorg-dev \ #
# # ANGLE
# mozjs (SpiderMonkey) xorg-dev \
autoconf2.13 \ #
# # mozjs (SpiderMonkey)
# Bindgen (for SpiderMonkey bindings) autoconf2.13 \
clang \ #
# # Bindgen (for SpiderMonkey bindings)
# gstreamer clang \
libglib2.0-dev \ #
libgstreamer-plugins-base1.0-dev \ # gstreamer
libgstreamer-plugins-bad1.0-dev \ libglib2.0-dev \
libgstreamer1.0-dev \ libgstreamer-plugins-base1.0-dev \
# libgstreamer-plugins-bad1.0-dev \
# OpenSSL libgstreamer1.0-dev \
libssl1.0-dev \ #
# # OpenSSL
# blurz libssl1.0-dev \
libdbus-1-dev \ #
# # blurz
# Skia libdbus-1-dev \
libglu1-mesa-dev \ #
libbz2-dev \ # Skia
# libglu1-mesa-dev \
# libbz2-dev \
#
#
&& \ && \
curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain none -y #
#
curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain none -y && \
#
#
curl -sSfL \
https://github.com/mozilla/sccache/releases/download/0.2.7/sccache-0.2.7-x86_64-unknown-linux-musl.tar.gz \
| tar -xz --strip-components=1 -C /usr/local/bin/ \
sccache-0.2.7-x86_64-unknown-linux-musl/sccache

View file

@ -46,6 +46,7 @@ def main():
decision.create_task_with_in_tree_dockerfile( decision.create_task_with_in_tree_dockerfile(
task_name="Linux x86_64: tidy + dev build + unit tests", task_name="Linux x86_64: tidy + dev build + unit tests",
command=""" command="""
sccache --version
./mach test-tidy --no-progress --all ./mach test-tidy --no-progress --all
#./mach build --dev #./mach build --dev
#./mach test-unit #./mach test-unit