AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[infra] Update GCC Docker images to have Python3

Browse Source 
Change-Id: I870cc04f9b45a77caa39b0996420fec622a79cf5
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/528336
Reviewed-by: Brian Osman <brianosman@google.com>
This commit is contained in:
Kevin Lubick 2022-04-07 09:40:20 -04:00
parent 541bfa05b5
commit eabed6ac67
8 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
infra/bots/recipe_modules/build/docker.py
View File

@ -5,15 +5,13 @@
from . import util
# TODO(dogben): Move this mapping to a machine-editable file.
IMAGES = {
'gcc-debian10': (
'gcr.io/skia-public/gcc-debian10@sha256:'
'89a72df1e2fdea6f774a3fa4199bb9aaa4a0526a3ac1f233e604d689b694f95c'),
'cd1dd99a3c423332a00998a20c4363aa1d5998b41f21e6e86ca016b412082777'),
'gcc-debian10-x86': (
'gcr.io/skia-public/gcc-debian10-x86@sha256:'
'b1ec55403ac66d9500d033d6ffd7663894d32335711fbbb0fb4c67dfce812203'),
'e30b4616f842fa2fd89329abf3d8e81cf6c25e147640289f37692f18862515c8'),
}

4
infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-GCC-x86-Debug-Docker.json
View File

@ -83,9 +83,9 @@
"type=bind,source=[START_DIR]/cache/work,target=/SRC",
"--mount",
"type=bind,source=[START_DIR]/cache/work/skia/out/Build-Debian10-GCC-x86-Debug-Docker/Debug,target=/OUT",
"gcr.io/skia-public/gcc-debian10-x86@sha256:b1ec55403ac66d9500d033d6ffd7663894d32335711fbbb0fb4c67dfce812203",
"gcr.io/skia-public/gcc-debian10-x86@sha256:e30b4616f842fa2fd89329abf3d8e81cf6c25e147640289f37692f18862515c8",
"/SRC/../RECIPE_MODULE[skia::build]/resources/docker-compile.sh",
"cc=\"gcc\" cxx=\"g++\" extra_cflags=[\"-O1\",\"-g1\",\"-DREBUILD_IF_CHANGED_docker_image=gcr.io/skia-public/gcc-debian10-x86@sha256:b1ec55403ac66d9500d033d6ffd7663894d32335711fbbb0fb4c67dfce812203\"] extra_ldflags=[] target_cpu=\"x86\" werror=true"
"cc=\"gcc\" cxx=\"g++\" extra_cflags=[\"-O1\",\"-g1\",\"-DREBUILD_IF_CHANGED_docker_image=gcr.io/skia-public/gcc-debian10-x86@sha256:e30b4616f842fa2fd89329abf3d8e81cf6c25e147640289f37692f18862515c8\"] extra_ldflags=[] target_cpu=\"x86\" werror=true"
],
"env": {
"CHROME_HEADLESS": "1",

4
infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-GCC-x86_64-Debug-Docker.json
View File

@ -83,9 +83,9 @@
"type=bind,source=[START_DIR]/cache/work,target=/SRC",
"--mount",
"type=bind,source=[START_DIR]/cache/work/skia/out/Build-Debian10-GCC-x86_64-Debug-Docker/Debug,target=/OUT",
"gcr.io/skia-public/gcc-debian10@sha256:89a72df1e2fdea6f774a3fa4199bb9aaa4a0526a3ac1f233e604d689b694f95c",
"gcr.io/skia-public/gcc-debian10@sha256:cd1dd99a3c423332a00998a20c4363aa1d5998b41f21e6e86ca016b412082777",
"/SRC/../RECIPE_MODULE[skia::build]/resources/docker-compile.sh",
"cc=\"gcc\" cxx=\"g++\" extra_cflags=[\"-O1\",\"-g1\",\"-DREBUILD_IF_CHANGED_docker_image=gcr.io/skia-public/gcc-debian10@sha256:89a72df1e2fdea6f774a3fa4199bb9aaa4a0526a3ac1f233e604d689b694f95c\"] extra_ldflags=[] target_cpu=\"x86_64\" werror=true"
"cc=\"gcc\" cxx=\"g++\" extra_cflags=[\"-O1\",\"-g1\",\"-DREBUILD_IF_CHANGED_docker_image=gcr.io/skia-public/gcc-debian10@sha256:cd1dd99a3c423332a00998a20c4363aa1d5998b41f21e6e86ca016b412082777\"] extra_ldflags=[] target_cpu=\"x86_64\" werror=true"
],
"env": {
"CHROME_HEADLESS": "1",

4
infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-GCC-x86_64-Release-NoGPU_Docker.json
View File

@ -83,9 +83,9 @@
"type=bind,source=[START_DIR]/cache/work,target=/SRC",
"--mount",
"type=bind,source=[START_DIR]/cache/work/skia/out/Build-Debian10-GCC-x86_64-Release-NoGPU_Docker/Release,target=/OUT",
"gcr.io/skia-public/gcc-debian10@sha256:89a72df1e2fdea6f774a3fa4199bb9aaa4a0526a3ac1f233e604d689b694f95c",
"gcr.io/skia-public/gcc-debian10@sha256:cd1dd99a3c423332a00998a20c4363aa1d5998b41f21e6e86ca016b412082777",
"/SRC/../RECIPE_MODULE[skia::build]/resources/docker-compile.sh",
"cc=\"gcc\" cxx=\"g++\" extra_cflags=[\"-g1\",\"-DREBUILD_IF_CHANGED_docker_image=gcr.io/skia-public/gcc-debian10@sha256:89a72df1e2fdea6f774a3fa4199bb9aaa4a0526a3ac1f233e604d689b694f95c\"] extra_ldflags=[] is_debug=false skia_enable_gpu=false target_cpu=\"x86_64\" werror=true"
"cc=\"gcc\" cxx=\"g++\" extra_cflags=[\"-g1\",\"-DREBUILD_IF_CHANGED_docker_image=gcr.io/skia-public/gcc-debian10@sha256:cd1dd99a3c423332a00998a20c4363aa1d5998b41f21e6e86ca016b412082777\"] extra_ldflags=[] is_debug=false skia_enable_gpu=false target_cpu=\"x86_64\" werror=true"
],
"env": {
"CHROME_HEADLESS": "1",

4
infra/bots/recipe_modules/build/examples/full.expected/Build-Debian10-GCC-x86_64-Release-Shared_Docker.json
View File

@ -83,9 +83,9 @@
"type=bind,source=[START_DIR]/cache/work,target=/SRC",
"--mount",
"type=bind,source=[START_DIR]/cache/work/skia/out/Build-Debian10-GCC-x86_64-Release-Shared_Docker/Release,target=/OUT",
"gcr.io/skia-public/gcc-debian10@sha256:89a72df1e2fdea6f774a3fa4199bb9aaa4a0526a3ac1f233e604d689b694f95c",
"gcr.io/skia-public/gcc-debian10@sha256:cd1dd99a3c423332a00998a20c4363aa1d5998b41f21e6e86ca016b412082777",
"/SRC/../RECIPE_MODULE[skia::build]/resources/docker-compile.sh",
"cc=\"gcc\" cxx=\"g++\" extra_cflags=[\"-g1\",\"-DREBUILD_IF_CHANGED_docker_image=gcr.io/skia-public/gcc-debian10@sha256:89a72df1e2fdea6f774a3fa4199bb9aaa4a0526a3ac1f233e604d689b694f95c\"] extra_ldflags=[] is_component_build=true is_debug=false target_cpu=\"x86_64\" werror=true"
"cc=\"gcc\" cxx=\"g++\" extra_cflags=[\"-g1\",\"-DREBUILD_IF_CHANGED_docker_image=gcr.io/skia-public/gcc-debian10@sha256:cd1dd99a3c423332a00998a20c4363aa1d5998b41f21e6e86ca016b412082777\"] extra_ldflags=[] is_component_build=true is_debug=false target_cpu=\"x86_64\" werror=true"
],
"env": {
"CHROME_HEADLESS": "1",

2
infra/bots/recipe_modules/build/examples/full.expected/unknown-docker-image.json
View File

@ -11,7 +11,7 @@
" api.build(checkout_root=checkout_root, out_dir=out_dir)",
" File \"RECIPE_REPO[skia]/infra/bots/recipe_modules/build/api.py\", line 53, in __call__",
" self.compile_fn(self.m, checkout_root, out_dir)",
" File \"RECIPE_REPO[skia]/infra/bots/recipe_modules/build/docker.py\", line 61, in compile_fn",
" File \"RECIPE_REPO[skia]/infra/bots/recipe_modules/build/docker.py\", line 59, in compile_fn",
" raise Exception('Not implemented: ' + api.vars.builder_name)",
"Exception('Not implemented: Build-Unix-GCC-x86_64-Release-Docker')"
]

3
infra/gcc/Debian10-x86/Dockerfile
View File

@ -7,5 +7,6 @@ RUN dpkg --add-architecture i386 && \
g++-multilib \
libfontconfig-dev:i386 \
libglu-dev:i386 \
python \
python3 \
&& rm -rf /var/lib/apt/lists/*
RUN ln -s /usr/bin/python3 /usr/bin/python

3
infra/gcc/Debian10/Dockerfile
View File

@ -5,5 +5,6 @@ RUN apt-get update && apt-get upgrade -y && apt-get install -y \
ca-certificates \
libfontconfig-dev \
libglu-dev \
python \
python3 \
&& rm -rf /var/lib/apt/lists/*
RUN ln -s /usr/bin/python3 /usr/bin/python