From 13a92b8cc227b5b802a9644019f4990595cd4e24 Mon Sep 17 00:00:00 2001
From: elsid <elsid.mail@gmail.com>
Date: Thu, 28 Jul 2022 23:03:50 +0200
Subject: [PATCH] Use Ubuntu 22.04 for Linux builds

---
 .gitlab-ci.yml            | 30 +++++++++++++++---------------
 CI/install_debian_deps.sh | 18 +++++++++---------
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9d816970ba..270a858dfd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -19,7 +19,7 @@ variables:
   tags:
     - docker
     - linux
-  image: ubuntu:focal
+  image: ubuntu:22.04
   rules:
     - if: $CI_PIPELINE_SOURCE == "push"
 
@@ -90,7 +90,7 @@ Coverity:
 Ubuntu_GCC:
   extends: .Ubuntu
   cache:
-    key: Ubuntu_GCC.v3
+    key: Ubuntu_GCC.ubuntu_22.04.v1
   before_script:
     - CI/install_debian_deps.sh gcc openmw-deps openmw-deps-dynamic
   variables:
@@ -103,7 +103,7 @@ Ubuntu_GCC:
 .Ubuntu_GCC_tests:
   extends: Ubuntu_GCC
   cache:
-    key: Ubuntu_GCC_tests.v3
+    key: Ubuntu_GCC_tests.ubuntu_22.04.v1
   variables:
     CCACHE_SIZE: 1G
     BUILD_TESTS_ONLY: 1
@@ -117,7 +117,7 @@ Ubuntu_GCC:
 .Ubuntu_GCC_tests_Debug:
   extends: Ubuntu_GCC
   cache:
-    key: Ubuntu_GCC_tests_Debug.v2
+    key: Ubuntu_GCC_tests_Debug.ubuntu_22.04.v1
   variables:
     CCACHE_SIZE: 1G
     BUILD_TESTS_ONLY: 1
@@ -133,7 +133,7 @@ Ubuntu_GCC:
 .Ubuntu_GCC_tests_asan:
   extends: Ubuntu_GCC
   cache:
-    key: Ubuntu_GCC_asan.v1
+    key: Ubuntu_GCC_asan.ubuntu_22.04.v1
   variables:
     CCACHE_SIZE: 1G
     BUILD_TESTS_ONLY: 1
@@ -151,7 +151,7 @@ Ubuntu_GCC:
 .Ubuntu_GCC_tests_ubsan:
   extends: Ubuntu_GCC
   cache:
-    key: Ubuntu_GCC_ubsan.v1
+    key: Ubuntu_GCC_ubsan.ubuntu_22.04.v1
   variables:
     CCACHE_SIZE: 1G
     BUILD_TESTS_ONLY: 1
@@ -168,7 +168,7 @@ Ubuntu_GCC:
 .Ubuntu_GCC_tests_tsan:
   extends: Ubuntu_GCC
   cache:
-    key: Ubuntu_GCC_tsan.v1
+    key: Ubuntu_GCC_tsan.ubuntu_22.04.v1
   variables:
     CCACHE_SIZE: 1G
     BUILD_TESTS_ONLY: 1
@@ -186,7 +186,7 @@ Ubuntu_GCC:
 .Ubuntu_GCC_tests_coverage:
   extends: .Ubuntu_GCC_tests_Debug
   cache:
-    key: Ubuntu_GCC_tests_coverage.v1
+    key: Ubuntu_GCC_tests_coverage.ubuntu_22.04.v1
   variables:
     BUILD_WITH_CODE_COVERAGE: 1
   before_script:
@@ -212,7 +212,7 @@ Ubuntu_GCC:
         - "CI/**/*"
         - ".gitlab-ci.yml"
   cache:
-    key: Ubuntu_Static_Deps.V1
+    key: Ubuntu_Static_Deps.ubuntu_22.04.v1
     paths:
       - apt-cache/
       - ccache/
@@ -229,7 +229,7 @@ Ubuntu_GCC:
 .Ubuntu_Static_Deps_tests:
   extends: .Ubuntu_Static_Deps
   cache:
-    key: Ubuntu_Static_Deps_tests.V1
+    key: Ubuntu_Static_Deps_tests.ubuntu_22.04.v1
   variables:
     CCACHE_SIZE: 1G
     BUILD_TESTS_ONLY: 1
@@ -248,19 +248,19 @@ Ubuntu_Clang:
   before_script:
     - CI/install_debian_deps.sh clang clang-tidy openmw-deps openmw-deps-dynamic
   cache:
-    key: Ubuntu_Clang.v2
+    key: Ubuntu_Clang.ubuntu_22.04.v1
   variables:
     CC: clang
     CXX: clang++
     CI_CLANG_TIDY: 1
     CCACHE_SIZE: 2G
   # When CCache doesn't exist (e.g. first build on a fork), build takes more than 1h, which is the default for forks.
-  timeout: 2h
+  timeout: 3h
 
 .Ubuntu_Clang_tests:
   extends: Ubuntu_Clang
   cache:
-    key: Ubuntu_Clang_tests.v3
+    key: Ubuntu_Clang_tests.ubuntu_22.04.v1
   variables:
     CCACHE_SIZE: 1G
     BUILD_TESTS_ONLY: 1
@@ -274,7 +274,7 @@ Ubuntu_Clang:
 Ubuntu_Clang_tests_Debug:
   extends: Ubuntu_Clang
   cache:
-    key: Ubuntu_Clang_tests_Debug.v1
+    key: Ubuntu_Clang_tests_Debug.ubuntu_22.04.v1
   variables:
     CCACHE_SIZE: 1G
     BUILD_TESTS_ONLY: 1
@@ -294,7 +294,7 @@ Ubuntu_Clang_integration_tests:
   variables:
     PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip"
   cache:
-    key: Ubuntu_Clang_integration_tests.v1
+    key: Ubuntu_Clang_integration_tests.ubuntu_22.04.v1
     paths:
       - .cache/pip
       - apt-cache/
diff --git a/CI/install_debian_deps.sh b/CI/install_debian_deps.sh
index 8342d89722..27baaec01b 100755
--- a/CI/install_debian_deps.sh
+++ b/CI/install_debian_deps.sh
@@ -50,13 +50,13 @@ declare -rA GROUPED_DEPS=(
     libavcodec58
     libavformat58
     libavutil56
-    libboost-filesystem1.71.0
-    libboost-iostreams1.71.0
-    libboost-program-options1.71.0
-    libboost-system1.71.0
-    libbullet2.88
-    libcollada-dom2.4-dp0
-    libicu66
+    libboost-filesystem1.74.0
+    libboost-iostreams1.74.0
+    libboost-program-options1.74.0
+    libboost-system1.74.0
+    libbullet3.06
+    libcollada-dom2.5-dp0
+    libicu70
     libjpeg8
     libluajit-5.1-2
     liblz4-1
@@ -71,7 +71,7 @@ declare -rA GROUPED_DEPS=(
     libswresample3
     libswscale5
     libtinyxml2.6.2v5
-    libyaml-cpp0.6
+    libyaml-cpp0.7
     python3-pip
     xvfb
   "
@@ -95,6 +95,6 @@ export APT_CACHE_DIR="${PWD}/apt-cache"
 set -x
 mkdir -pv "$APT_CACHE_DIR"
 apt-get update -yqq
-apt-get -qq -o dir::cache::archives="$APT_CACHE_DIR" install -y --no-install-recommends software-properties-common >/dev/null
+apt-get -qq -o dir::cache::archives="$APT_CACHE_DIR" install -y --no-install-recommends software-properties-common gnupg >/dev/null
 add-apt-repository -y ppa:openmw/openmw
 apt-get -qq -o dir::cache::archives="$APT_CACHE_DIR" install -y --no-install-recommends "${deps[@]}" >/dev/null