From 80801406ce7b39aada3def02d5a471dba2bbe7cc Mon Sep 17 00:00:00 2001
From: Keiichi Watanabe <keiichiw@chromium.org>
Date: Fri, 29 Oct 2021 11:08:30 +0900
Subject: [PATCH] github: Use install-deps script

We now install newer meson via pip instead of apt-get.

BUG=none
TEST=run GitHub action on my personal account

Change-Id: Icbe55bf06e84253cd26e676647bca17408ab9d9b
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/platform/crosvm/+/3251824
Auto-Submit: Keiichi Watanabe <keiichiw@chromium.org>
Commit-Queue: Dennis Kempin <denniskempin@google.com>
Tested-by: kokoro <noreply+kokoro@google.com>
Reviewed-by: Dennis Kempin <denniskempin@google.com>
---
 .github/workflows/gh-pages.yml | 24 +-----------------------
 tools/install-deps             |  5 ++++-
 2 files changed, 5 insertions(+), 24 deletions(-)

diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml
index 5889d011b9..5d96801c08 100644
--- a/.github/workflows/gh-pages.yml
+++ b/.github/workflows/gh-pages.yml
@@ -20,29 +20,7 @@ jobs:
           mdbook-version: 'latest'
       - name: Install Dependencies
         run: |
-          cargo install mdbook-mermaid
-          sudo apt update
-          sudo apt install -y \
-          build-essential \
-          clang \
-          libasound2-dev \
-          libcap-dev \
-          libdbus-1-dev \
-          libdrm-dev \
-          libepoxy-dev \
-          libssl-dev \
-          libwayland-bin \
-          libwayland-dev \
-          ninja-build \
-          pkg-config \
-          protobuf-compiler \
-          python3 \
-          python3-pip \
-          python3-setuptools \
-          python3-wheel \
-          wayland-protocols
-          # Install meson for rutabaga_gfx
-          pip3 install meson
+          ./tools/install-deps
       - name: Run mdbook
         run: |
           mkdir -p docs/target/
diff --git a/tools/install-deps b/tools/install-deps
index 4e0d46b642..bb32049633 100755
--- a/tools/install-deps
+++ b/tools/install-deps
@@ -4,6 +4,7 @@
 # found in the LICENSE file.
 set -ex
 
+sudo apt-get update
 sudo apt-get install --yes --no-install-recommends \
     ca-certificates \
     clang \
@@ -25,7 +26,6 @@ sudo apt-get install --yes --no-install-recommends \
     libwayland-dev \
     libxext-dev \
     make \
-    meson \
     nasm \
     ninja-build \
     openssh-client \
@@ -38,6 +38,9 @@ sudo apt-get install --yes --no-install-recommends \
     screen \
     wayland-protocols
 
+# Install meson for rutabaga_gfx
+pip3 install meson
+
 rustup component add clippy
 rustup component add rustfmt