From 010dc90d42b9467127ab323b387784df1f2e5596 Mon Sep 17 00:00:00 2001
From: psi29a <psi29a@gmail.com>
Date: Mon, 31 Jan 2022 07:57:08 +0000
Subject: [PATCH] Have Android CI also use latest ccache to fix issues with
 cmake.

---
 .gitlab-ci.yml            | 14 ++++++--------
 CI/install_debian_deps.sh | 10 +++-------
 2 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3b34b0c07f..aaf7f233f0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -68,7 +68,7 @@ Coverity:
   rules:
     - if: $CI_PIPELINE_SOURCE == "schedule"
   before_script:
-    - CI/install_debian_deps.sh clang openmw-deps openmw-deps-dynamic coverity
+    - CI/install_debian_deps.sh clang openmw-deps openmw-deps-dynamic
     - curl -o /tmp/cov-analysis-linux64.tgz https://scan.coverity.com/download/linux64 --form project=$COVERITY_SCAN_PROJECT_NAME --form token=$COVERITY_SCAN_TOKEN
     - tar xfz /tmp/cov-analysis-linux64.tgz
   script:
@@ -181,9 +181,9 @@ Ubuntu_Static_Deps:
   cache:
     key: Ubuntu_Static_Deps.V1
     paths:
-    - apt-cache/
-    - ccache/
-    - build/extern/fetched/
+      - apt-cache/
+      - ccache/
+      - build/extern/fetched/
   before_script:
     - CI/install_debian_deps.sh clang openmw-deps openmw-deps-static
   variables:
@@ -555,15 +555,13 @@ Ubuntu_AndroidNDK_arm64-v8a:
   variables:
     CCACHE_SIZE: 3G
   cache:
-    key: Ubuntu__Focal_AndroidNDK_r22b_arm64-v8a.v1
+    key: Ubuntu__Focal_AndroidNDK_r22b_arm64-v8a.v2
     paths:
       - apt-cache/
       - ccache/
       - build/extern/fetched/
   before_script:
-    - export APT_CACHE_DIR=`pwd`/apt-cache && mkdir -pv $APT_CACHE_DIR
-    - apt-get update -yq
-    - apt-get -q -o dir::cache::archives="$APT_CACHE_DIR" install -y cmake ccache curl unzip git build-essential
+    - CI/install_debian_deps.sh gcc
   stage: build
   script:
     - export CCACHE_BASEDIR="`pwd`"
diff --git a/CI/install_debian_deps.sh b/CI/install_debian_deps.sh
index 131ccae305..74b0746ac0 100755
--- a/CI/install_debian_deps.sh
+++ b/CI/install_debian_deps.sh
@@ -9,13 +9,11 @@ print_help() {
 }
 
 declare -rA GROUPED_DEPS=(
-  [gcc]="binutils gcc g++ libc-dev"
-  [clang]="binutils clang"
+  [gcc]="binutils gcc build-essential cmake ccache curl unzip git pkg-config"
+  [clang]="binutils clang make cmake ccache curl unzip git pkg-config"
 
   # Common dependencies for building OpenMW.
   [openmw-deps]="
-    make cmake ccache git pkg-config
-
     libboost-filesystem-dev libboost-program-options-dev
     libboost-system-dev libboost-iostreams-dev
 
@@ -27,7 +25,6 @@ declare -rA GROUPED_DEPS=(
 
   # These dependencies can alternatively be built and linked statically.
   [openmw-deps-dynamic]="libmygui-dev libopenscenegraph-dev libsqlite3-dev"
-  [coverity]="curl"
   [clang-tidy]="clang-tidy"
 
   # Pre-requisites for building MyGUI and OSG for static linking.
@@ -40,8 +37,7 @@ declare -rA GROUPED_DEPS=(
   #   * JPEG: libjpeg-dev
   #   * PNG: libpng-dev
   [openmw-deps-static]="
-    make cmake
-    ccache curl unzip libcollada-dom-dev libfreetype6-dev libjpeg-dev libpng-dev
+    libcollada-dom-dev libfreetype6-dev libjpeg-dev libpng-dev
     libsdl2-dev libboost-system-dev libboost-filesystem-dev libgl-dev
   "
 )