From 130710d518b90391ce7a43f3f42846e5c50372a4 Mon Sep 17 00:00:00 2001 From: Max Moroz Date: Thu, 12 Mar 2020 09:06:46 -0700 Subject: [PATCH] [infra] Change language attribute from "cpp" to "c++" in build scripts. (#3493) * [infra] Change language attribute from "cpp" to "c++" in coverage job runner. Should've done this in https://github.com/google/oss-fuzz/pull/3477. Good news is that nothing failed, the coverage job was just skipped for pretty much all projects. * also remove default value from build_project script --- infra/gcb/build_and_run_coverage.py | 2 +- infra/gcb/build_project.py | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/infra/gcb/build_and_run_coverage.py b/infra/gcb/build_and_run_coverage.py index 40292abf0..60f666c06 100644 --- a/infra/gcb/build_and_run_coverage.py +++ b/infra/gcb/build_and_run_coverage.py @@ -36,7 +36,7 @@ LATEST_REPORT_INFO_CONTENT_TYPE = 'application/json' UPLOAD_URL_FORMAT = 'gs://' + COVERAGE_BUCKET_NAME + '/{project}/{type}/{date}' # Languages from project.yaml that have code coverage support. -LANGUAGES_WITH_COVERAGE_SUPPORT = ['c', 'cpp'] +LANGUAGES_WITH_COVERAGE_SUPPORT = ['c', 'c++'] def skip_build(message): diff --git a/infra/gcb/build_project.py b/infra/gcb/build_project.py index 06eb6b384..f58b6cd05 100644 --- a/infra/gcb/build_project.py +++ b/infra/gcb/build_project.py @@ -61,7 +61,6 @@ def load_project_yaml(project_dir): project_yaml.setdefault('run_tests', True) project_yaml.setdefault('coverage_extra_args', '') project_yaml.setdefault('labels', {}) - project_yaml.setdefault('language', 'cpp') return project_yaml