From 05f0b4cdbdb4d32b98709b547faff59d498a5f62 Mon Sep 17 00:00:00 2001 From: Evil Eye Date: Sat, 2 Aug 2025 10:50:43 +0200 Subject: [PATCH 1/5] Use the default clang version in Coverity --- .gitlab-ci.yml | 8 ++++---- CI/install_debian_deps.sh | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index fedc707bd7..0d87ed9e03 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -99,8 +99,8 @@ Coverity: - saas-linux-medium-amd64 image: ubuntu:24.04 stage: build - rules: - - if: $CI_PIPELINE_SOURCE == "schedule" +# rules: +# - if: $CI_PIPELINE_SOURCE == "schedule" cache: key: Coverity.ubuntu_24.04.v1 paths: @@ -108,8 +108,8 @@ Coverity: - ccache/ variables: CCACHE_SIZE: 2G - CC: clang-12 - CXX: clang++-12 + CC: clang + CXX: clang++ CMAKE_BUILD_TYPE: Debug CMAKE_CXX_FLAGS_DEBUG: -O0 before_script: diff --git a/CI/install_debian_deps.sh b/CI/install_debian_deps.sh index 4f0e7cdb69..7f50a2eb1a 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-12 make cmake ccache curl unzip git pkg-config" + [coverity]="binutils clang make cmake ccache curl unzip git pkg-config" [gcc_preprocess]=" binutils build-essential From 550b0c985f3f47fb401b173955ddbee92d71c5be Mon Sep 17 00:00:00 2001 From: Evil Eye Date: Sat, 2 Aug 2025 10:56:50 +0200 Subject: [PATCH 2/5] Include file --- CI/install_debian_deps.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CI/install_debian_deps.sh b/CI/install_debian_deps.sh index 7f50a2eb1a..d4a7e88ed6 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 make cmake ccache curl unzip git pkg-config file" [gcc_preprocess]=" binutils build-essential From 7569273b33f8398439c629f468efab4cc0d9bf35 Mon Sep 17 00:00:00 2001 From: unknown Date: Sun, 3 Aug 2025 17:06:47 +0200 Subject: [PATCH 3/5] Expose cov-int.tar.gz as an artifact and upload its URL --- .gitlab-ci.yml | 22 ++++++++++++++++------ CI/install_debian_deps.sh | 1 + 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 0d87ed9e03..ca36ba0f4d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -125,18 +125,28 @@ Coverity: - ccache -z -M "${CCACHE_SIZE}" - CI/before_script.linux.sh - cov-analysis-linux64-*/bin/cov-configure --template --comptype prefix --compiler ccache - # Remove the specific targets and build everything once we can do it under 3h - cov-analysis-linux64-*/bin/cov-build --dir cov-int cmake --build build -- -j $(nproc) - ccache -svv - after_script: - tar cfz cov-int.tar.gz cov-int - - curl https://scan.coverity.com/builds?project=$COVERITY_SCAN_PROJECT_NAME - --form token=$COVERITY_SCAN_TOKEN --form email=$GITLAB_USER_EMAIL - --form file=@cov-int.tar.gz --form version="$CI_COMMIT_REF_NAME:$CI_COMMIT_SHORT_SHA" - --form description="CI_COMMIT_SHORT_SHA / $CI_COMMIT_TITLE / $CI_COMMIT_REF_NAME:$CI_PIPELINE_ID" artifacts: + expire_in: 1 day paths: - /builds/OpenMW/openmw/cov-int/build-log.txt + - /builds/OpenMW/openmw/cov-int.tar.gz + +Coverity_Upload: + image: ubuntu:24.04 + stage: build + before_script: + - CI/install_debian_deps.sh coverity_upload + script: + - curl https://scan.coverity.com/builds?project=$COVERITY_SCAN_PROJECT_NAME + --form token=$COVERITY_SCAN_TOKEN --form email=$GITLAB_USER_EMAIL + --form version="$CI_COMMIT_REF_NAME:$CI_COMMIT_SHORT_SHA" + --form description="CI_COMMIT_SHORT_SHA / $CI_COMMIT_TITLE / $CI_COMMIT_REF_NAME:$CI_PIPELINE_ID" + --form url="$CI_API_V4_URL/projects/$CI_PROJECT_ID/jobs/artifacts/$CI_DEFAULT_BRANCH_SLUG/raw/cov-int.tar.gz?job=Coverity" + needs: + - Coverity Ubuntu_GCC: extends: .Ubuntu diff --git a/CI/install_debian_deps.sh b/CI/install_debian_deps.sh index d4a7e88ed6..aada722fb1 100755 --- a/CI/install_debian_deps.sh +++ b/CI/install_debian_deps.sh @@ -12,6 +12,7 @@ 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 file" + [coverity_upload]="curl" [gcc_preprocess]=" binutils build-essential From b6b4e4f1020ccdb8ca4abee737311e956f881251 Mon Sep 17 00:00:00 2001 From: unknown Date: Sun, 3 Aug 2025 18:36:30 +0200 Subject: [PATCH 4/5] Use a URL that doesn't require the pipeline to succeed --- .gitlab-ci.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ca36ba0f4d..26497649d1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -128,11 +128,14 @@ Coverity: - cov-analysis-linux64-*/bin/cov-build --dir cov-int cmake --build build -- -j $(nproc) - ccache -svv - tar cfz cov-int.tar.gz cov-int + - echo "OPENMW_JOB_ID=$CI_JOB_ID" >> build.env artifacts: expire_in: 1 day paths: - /builds/OpenMW/openmw/cov-int/build-log.txt - /builds/OpenMW/openmw/cov-int.tar.gz + reports: + dotenv: build.env Coverity_Upload: image: ubuntu:24.04 @@ -140,11 +143,12 @@ Coverity_Upload: before_script: - CI/install_debian_deps.sh coverity_upload script: + - echo "$CI_API_V4_URL/projects/$CI_PROJECT_ID/jobs/$OPENMW_JOB_ID/artifacts/cov-int.tar.gz" - curl https://scan.coverity.com/builds?project=$COVERITY_SCAN_PROJECT_NAME --form token=$COVERITY_SCAN_TOKEN --form email=$GITLAB_USER_EMAIL --form version="$CI_COMMIT_REF_NAME:$CI_COMMIT_SHORT_SHA" --form description="CI_COMMIT_SHORT_SHA / $CI_COMMIT_TITLE / $CI_COMMIT_REF_NAME:$CI_PIPELINE_ID" - --form url="$CI_API_V4_URL/projects/$CI_PROJECT_ID/jobs/artifacts/$CI_DEFAULT_BRANCH_SLUG/raw/cov-int.tar.gz?job=Coverity" + --form url="$CI_API_V4_URL/projects/$CI_PROJECT_ID/jobs/$OPENMW_JOB_ID/artifacts/cov-int.tar.gz" needs: - Coverity From 3bf62235ba968186d18d511f30f91bbabea5ac28 Mon Sep 17 00:00:00 2001 From: unknown Date: Sun, 3 Aug 2025 20:05:36 +0200 Subject: [PATCH 5/5] Restore rules --- .gitlab-ci.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 26497649d1..cdda455dac 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -99,8 +99,8 @@ Coverity: - saas-linux-medium-amd64 image: ubuntu:24.04 stage: build -# rules: -# - if: $CI_PIPELINE_SOURCE == "schedule" + rules: + - if: $CI_PIPELINE_SOURCE == "schedule" cache: key: Coverity.ubuntu_24.04.v1 paths: @@ -140,6 +140,8 @@ Coverity: Coverity_Upload: image: ubuntu:24.04 stage: build + rules: + - if: $CI_PIPELINE_SOURCE == "schedule" before_script: - CI/install_debian_deps.sh coverity_upload script: