commit 6249b2458124e567099b01503b0ac7dedf5c87c1
author Ben Clayton <bclayton@google.com> Fri Apr 08 12:31:36 2022 +0000
committer Dawn LUCI CQ <dawn-scoped@luci-project-accounts.iam.gserviceaccount.com> Fri Apr 08 12:31:36 2022 +0000
tree 31bd1c0f93be1b768cab79b67b5214c9cd4ce5c1
parent c4502a0c41ddf65974165d01dfea9942905ca2f4

Kokoro: install GLFW dependencies

Dawn depends on GLFW, which in turn depends on a number of system
dependencies to be installed. These are not part of the docker image, so
need to be installed on the fly.

Also disable the Kokoro doxygen step as this is still being worked on.

Bug: dawn:1339
Bug: dawn:1358
Bug: tint:1498
Change-Id: I1a33044d11c243fc3809c2b5b4d25f0bfc943d6e
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/86071
Auto-Submit: Ben Clayton <bclayton@google.com>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Commit-Queue: Corentin Wallez <cwallez@chromium.org>

infra/kokoro/linux/docker.sh

diff --git a/infra/kokoro/linux/docker.sh b/infra/kokoro/linux/docker.sh
index 3d3c641..65e10f0 100755
--- a/infra/kokoro/linux/docker.sh
+++ b/infra/kokoro/linux/docker.sh
@@ -93,6 +93,21 @@
 status "Linting"
 ./tools/lint
 
+if [ "$BUILD_SYSTEM" == "cmake" ]; then
+    # TODO(crbug.com/dawn/1358): Remove the need to depend on GLFW.
+    status "Installing GLFW system dependencies [crbug.com/dawn/1358]"
+    sudo apt update
+    sudo apt -y install \
+        libgl-dev \
+        libx11-dev \
+        libx11-xcb-dev \
+        libxcursor-dev \
+        libxext-dev \
+        libxi-dev \
+        libxinerama-dev \
+        libxrandr-dev
+fi
+
 status "Configuring build system"
 if [ "$BUILD_SYSTEM" == "cmake" ]; then
     using cmake-3.17.2
@@ -121,16 +136,18 @@
 
     cd ${BUILD_DIR}
 
-    status "Running Doxygen"
-    echo "NOTE: This will fail on first warning. Run with -DTINT_DOCS_WARN_AS_ERROR=OFF to see all warnings".
-    echo ""
-    show_cmds
-        # NOTE: If we upgrade Doxygen to a more recent version, we can set DOXYGEN_WARN_AS_ERROR to
-        # "FAIL_ON_WARNINGS" instead of "YES" in our CMakeLists.txt so see all warnings, and then
-        # fail. See https://www.doxygen.nl/manual/config.html#cfg_warn_as_error
-        cmake ${SRC_DIR} ${CMAKE_FLAGS} ${COMMON_CMAKE_FLAGS}
-        cmake --build . --target tint-docs
-    hide_cmds
+    # TODO(crbug.com/tint/1498): Doxygen is currently disabled.
+    #
+    # status "Running Doxygen"
+    # echo "NOTE: This will fail on first warning. Run with -DTINT_DOCS_WARN_AS_ERROR=OFF to see all warnings".
+    # echo ""
+    # show_cmds
+    #     # NOTE: If we upgrade Doxygen to a more recent version, we can set DOXYGEN_WARN_AS_ERROR to
+    #     # "FAIL_ON_WARNINGS" instead of "YES" in our CMakeLists.txt so see all warnings, and then
+    #     # fail. See https://www.doxygen.nl/manual/config.html#cfg_warn_as_error
+    #     cmake ${SRC_DIR} ${CMAKE_FLAGS} ${COMMON_CMAKE_FLAGS}
+    #     cmake --build . --target tint-docs
+    # hide_cmds
 
     status "Building dawn in '${BUILD_DIR}'"
     show_cmds