diff options
| author | psi29a <psi29a@gmail.com> | 2022-09-30 13:11:16 +0000 |
|---|---|---|
| committer | psi29a <psi29a@gmail.com> | 2022-09-30 13:11:16 +0000 |
| commit | 71872a92fcd3c755fed01a7c04c9f6c58c821f40 (patch) | |
| tree | 462e5e9521b03c5cec157641f7f336cf562232ce | |
| parent | 3bcdfde1c1f79a8e242d453ff2d00a02686aa67a (diff) | |
Update CI/install_debian_deps.sh, .gitlab-ci.ymlcoverity_clang_test
| -rw-r--r-- | .gitlab-ci.yml | 5 | ||||
| -rwxr-xr-x | CI/install_debian_deps.sh | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 47f1d023c2..62951050a5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -69,8 +69,8 @@ Coverity: - linux image: ubuntu:20.04 stage: build - #rules: # TODO: remove comment before merging - # - if: $CI_PIPELINE_SOURCE == "schedule" + rules: # TODO: remove comment before merging + - if: $CI_PIPELINE_SOURCE == "schedule" cache: key: Coverity.ubuntu_20.04.v1 paths: @@ -84,7 +84,6 @@ Coverity: CMAKE_CXX_FLAGS_DEBUG: -O0 before_script: - CI/install_debian_deps.sh coverity openmw-deps openmw-deps-dynamic - - apt-get install -y clang-11 - 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 5aa400428f..bc35e8c040 100755 --- a/CI/install_debian_deps.sh +++ b/CI/install_debian_deps.sh @@ -11,7 +11,7 @@ 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" - [coverity]="binutils clang make cmake ccache curl unzip git pkg-config" + [coverity]="binutils clang-11 make cmake ccache curl unzip git pkg-config" # Common dependencies for building OpenMW. [openmw-deps]=" |