mirror/openmw
1
0
Fork 0
mirror of https://github.com/OpenMW/openmw.git synced 2025-01-30 21:15:36 +00:00
Code Issues Releases Wiki Activity

Use Ubuntu 22.04 for Linux builds

Browse source
This commit is contained in:
elsid 2022-07-28 23:03:50 +02:00
parent 2833d587a2
commit 13a92b8cc2
No known key found for this signature in database
GPG key ID: 4DE04C198CBA7625
2 changed files with 24 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
.gitlab-ci.yml
View file

@ -19,7 +19,7 @@ variables:
tags: tags:
- docker - docker
- linux - linux
image: ubuntu:focal image: ubuntu:22.04
rules: rules:
- if: $CI_PIPELINE_SOURCE == "push" - if: $CI_PIPELINE_SOURCE == "push"
@ -90,7 +90,7 @@ Coverity:
Ubuntu_GCC: Ubuntu_GCC:
extends: .Ubuntu extends: .Ubuntu
cache: cache:
key: Ubuntu_GCC.v3 key: Ubuntu_GCC.ubuntu_22.04.v1
before_script: before_script:
- CI/install_debian_deps.sh gcc openmw-deps openmw-deps-dynamic - CI/install_debian_deps.sh gcc openmw-deps openmw-deps-dynamic
variables: variables:
@ -103,7 +103,7 @@ Ubuntu_GCC:
.Ubuntu_GCC_tests: .Ubuntu_GCC_tests:
extends: Ubuntu_GCC extends: Ubuntu_GCC
cache: cache:
key: Ubuntu_GCC_tests.v3 key: Ubuntu_GCC_tests.ubuntu_22.04.v1
variables: variables:
CCACHE_SIZE: 1G CCACHE_SIZE: 1G
BUILD_TESTS_ONLY: 1 BUILD_TESTS_ONLY: 1
@ -117,7 +117,7 @@ Ubuntu_GCC:
.Ubuntu_GCC_tests_Debug: .Ubuntu_GCC_tests_Debug:
extends: Ubuntu_GCC extends: Ubuntu_GCC
cache: cache:
key: Ubuntu_GCC_tests_Debug.v2 key: Ubuntu_GCC_tests_Debug.ubuntu_22.04.v1
variables: variables:
CCACHE_SIZE: 1G CCACHE_SIZE: 1G
BUILD_TESTS_ONLY: 1 BUILD_TESTS_ONLY: 1
@ -133,7 +133,7 @@ Ubuntu_GCC:
.Ubuntu_GCC_tests_asan: .Ubuntu_GCC_tests_asan:
extends: Ubuntu_GCC extends: Ubuntu_GCC
cache: cache:
key: Ubuntu_GCC_asan.v1 key: Ubuntu_GCC_asan.ubuntu_22.04.v1
variables: variables:
CCACHE_SIZE: 1G CCACHE_SIZE: 1G
BUILD_TESTS_ONLY: 1 BUILD_TESTS_ONLY: 1
@ -151,7 +151,7 @@ Ubuntu_GCC:
.Ubuntu_GCC_tests_ubsan: .Ubuntu_GCC_tests_ubsan:
extends: Ubuntu_GCC extends: Ubuntu_GCC
cache: cache:
key: Ubuntu_GCC_ubsan.v1 key: Ubuntu_GCC_ubsan.ubuntu_22.04.v1
variables: variables:
CCACHE_SIZE: 1G CCACHE_SIZE: 1G
BUILD_TESTS_ONLY: 1 BUILD_TESTS_ONLY: 1
@ -168,7 +168,7 @@ Ubuntu_GCC:
.Ubuntu_GCC_tests_tsan: .Ubuntu_GCC_tests_tsan:
extends: Ubuntu_GCC extends: Ubuntu_GCC
cache: cache:
key: Ubuntu_GCC_tsan.v1 key: Ubuntu_GCC_tsan.ubuntu_22.04.v1
variables: variables:
CCACHE_SIZE: 1G CCACHE_SIZE: 1G
BUILD_TESTS_ONLY: 1 BUILD_TESTS_ONLY: 1
@ -186,7 +186,7 @@ Ubuntu_GCC:
.Ubuntu_GCC_tests_coverage: .Ubuntu_GCC_tests_coverage:
extends: .Ubuntu_GCC_tests_Debug extends: .Ubuntu_GCC_tests_Debug
cache: cache:
key: Ubuntu_GCC_tests_coverage.v1 key: Ubuntu_GCC_tests_coverage.ubuntu_22.04.v1
variables: variables:
BUILD_WITH_CODE_COVERAGE: 1 BUILD_WITH_CODE_COVERAGE: 1
before_script: before_script:
@ -212,7 +212,7 @@ Ubuntu_GCC:
- "CI/**/*" - "CI/**/*"
- ".gitlab-ci.yml" - ".gitlab-ci.yml"
cache: cache:
key: Ubuntu_Static_Deps.V1 key: Ubuntu_Static_Deps.ubuntu_22.04.v1
paths: paths:
- apt-cache/ - apt-cache/
- ccache/ - ccache/
@ -229,7 +229,7 @@ Ubuntu_GCC:
.Ubuntu_Static_Deps_tests: .Ubuntu_Static_Deps_tests:
extends: .Ubuntu_Static_Deps extends: .Ubuntu_Static_Deps
cache: cache:
key: Ubuntu_Static_Deps_tests.V1 key: Ubuntu_Static_Deps_tests.ubuntu_22.04.v1
variables: variables:
CCACHE_SIZE: 1G CCACHE_SIZE: 1G
BUILD_TESTS_ONLY: 1 BUILD_TESTS_ONLY: 1
@ -248,19 +248,19 @@ Ubuntu_Clang:
before_script: before_script:
- CI/install_debian_deps.sh clang clang-tidy openmw-deps openmw-deps-dynamic - CI/install_debian_deps.sh clang clang-tidy openmw-deps openmw-deps-dynamic
cache: cache:
key: Ubuntu_Clang.v2 key: Ubuntu_Clang.ubuntu_22.04.v1
variables: variables:
CC: clang CC: clang
CXX: clang++ CXX: clang++
CI_CLANG_TIDY: 1 CI_CLANG_TIDY: 1
CCACHE_SIZE: 2G 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. # 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: .Ubuntu_Clang_tests:
extends: Ubuntu_Clang extends: Ubuntu_Clang
cache: cache:
key: Ubuntu_Clang_tests.v3 key: Ubuntu_Clang_tests.ubuntu_22.04.v1
variables: variables:
CCACHE_SIZE: 1G CCACHE_SIZE: 1G
BUILD_TESTS_ONLY: 1 BUILD_TESTS_ONLY: 1
@ -274,7 +274,7 @@ Ubuntu_Clang:
Ubuntu_Clang_tests_Debug: Ubuntu_Clang_tests_Debug:
extends: Ubuntu_Clang extends: Ubuntu_Clang
cache: cache:
key: Ubuntu_Clang_tests_Debug.v1 key: Ubuntu_Clang_tests_Debug.ubuntu_22.04.v1
variables: variables:
CCACHE_SIZE: 1G CCACHE_SIZE: 1G
BUILD_TESTS_ONLY: 1 BUILD_TESTS_ONLY: 1
@ -294,7 +294,7 @@ Ubuntu_Clang_integration_tests:
variables: variables:
PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip" PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip"
cache: cache:
key: Ubuntu_Clang_integration_tests.v1 key: Ubuntu_Clang_integration_tests.ubuntu_22.04.v1
paths: paths:
- .cache/pip - .cache/pip
- apt-cache/ - apt-cache/

18
CI/install_debian_deps.sh
View file

@ -50,13 +50,13 @@ declare -rA GROUPED_DEPS=(
libavcodec58 libavcodec58
libavformat58 libavformat58
libavutil56 libavutil56
libboost-filesystem1.71.0 libboost-filesystem1.74.0
libboost-iostreams1.71.0 libboost-iostreams1.74.0
libboost-program-options1.71.0 libboost-program-options1.74.0
libboost-system1.71.0 libboost-system1.74.0
libbullet2.88 libbullet3.06
libcollada-dom2.4-dp0 libcollada-dom2.5-dp0
libicu66 libicu70
libjpeg8 libjpeg8
libluajit-5.1-2 libluajit-5.1-2
liblz4-1 liblz4-1
@ -71,7 +71,7 @@ declare -rA GROUPED_DEPS=(
libswresample3 libswresample3
libswscale5 libswscale5
libtinyxml2.6.2v5 libtinyxml2.6.2v5
libyaml-cpp0.6 libyaml-cpp0.7
python3-pip python3-pip
xvfb xvfb
" "
@ -95,6 +95,6 @@ export APT_CACHE_DIR="${PWD}/apt-cache"
set -x set -x
mkdir -pv "$APT_CACHE_DIR" mkdir -pv "$APT_CACHE_DIR"
apt-get update -yqq 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 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 apt-get -qq -o dir::cache::archives="$APT_CACHE_DIR" install -y --no-install-recommends "${deps[@]}" >/dev/null