diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d33286c1ab..7645f4c984 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -66,12 +66,12 @@ Coverity: tags: - docker - linux - image: ubuntu:20.04 + image: ubuntu:22.04 stage: build rules: - if: $CI_PIPELINE_SOURCE == "schedule" cache: - key: Coverity.ubuntu_20.04.v1 + key: Coverity.ubuntu_22.04.v1 paths: - apt-cache/ - ccache/ @@ -82,7 +82,7 @@ Coverity: CMAKE_BUILD_TYPE: Debug CMAKE_CXX_FLAGS_DEBUG: -O0 before_script: - - CI/install_debian_deps.sh clang_ubuntu_20_04 openmw-deps openmw-deps-dynamic + - CI/install_debian_deps.sh 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 diff --git a/CI/install_debian_deps.sh b/CI/install_debian_deps.sh index ad4a318e83..ca68326a63 100755 --- a/CI/install_debian_deps.sh +++ b/CI/install_debian_deps.sh @@ -11,7 +11,6 @@ print_help() { declare -rA GROUPED_DEPS=( [gcc]="binutils gcc build-essential cmake ccache curl unzip git pkg-config mold" [clang]="binutils clang make cmake ccache curl unzip git pkg-config mold" - [clang_ubuntu_20_04]="binutils clang make cmake ccache curl unzip git pkg-config" # Common dependencies for building OpenMW. [openmw-deps]="