diff options
-rw-r--r-- | etc/evergreen.yml | 3 | ||||
-rw-r--r-- | etc/evergreen_yml_components/definitions.yml | 30 | ||||
-rw-r--r-- | etc/evergreen_yml_components/variants/compile_static_analysis.yml | 2 | ||||
-rw-r--r-- | evergreen/ninja_compile.sh | 5 |
4 files changed, 38 insertions, 2 deletions
diff --git a/etc/evergreen.yml b/etc/evergreen.yml index dd7239ec764..ea7c408e671 100644 --- a/etc/evergreen.yml +++ b/etc/evergreen.yml @@ -3277,6 +3277,9 @@ buildvariants: compile_variant: *commit-queue depends_on: [] tasks: + - name: compile_ninja_quick_TG + distros: + - rhel80-xlarge-commitqueue - name: compile_test_and_package_parallel_core_stream_TG distros: - rhel80-xlarge-commitqueue diff --git a/etc/evergreen_yml_components/definitions.yml b/etc/evergreen_yml_components/definitions.yml index 914b5c3299a..8da87b6cd51 100644 --- a/etc/evergreen_yml_components/definitions.yml +++ b/etc/evergreen_yml_components/definitions.yml @@ -2567,6 +2567,25 @@ tasks: - func: "ninja compile" vars: ninja_file: "build.ninja" + targets: "install-devcore compiledb" + +- name: compile_ninja_quick + tags: [] + depends_on: + - name: version_expansions_gen + variant: generate-tasks-for-version + commands: + - func: "scons compile" + vars: + generating_for_ninja: true + separate_debug: off + task_compile_flags: >- + --ninja + - *f_expansions_write + - func: "ninja compile" + vars: + ninja_file: "build.ninja" + targets: "install-wiredtiger compiledb" - name: compile_ninja_default_profile tags: [] @@ -2604,6 +2623,7 @@ tasks: - func: "ninja compile" vars: ninja_file: "build.ninja" + targets: "install-devcore compiledb" - name: compile_ninja_opt_profile tags: [] @@ -2623,6 +2643,7 @@ tasks: - func: "ninja compile" vars: ninja_file: "opt.ninja" + targets: "install-devcore compiledb" - name: compile_ninja_fast_profile tags: [] @@ -2642,6 +2663,7 @@ tasks: - func: "ninja compile" vars: ninja_file: "fast.ninja" + targets: "install-devcore compiledb" - name: compile_ninja_san_profile tags: [] @@ -2662,6 +2684,7 @@ tasks: - func: "ninja compile" vars: ninja_file: "san.ninja" + targets: "install-devcore compiledb" - name: compile_ninja_compiledb_profile tags: [] @@ -2680,6 +2703,7 @@ tasks: - func: "ninja compile" vars: ninja_file: "compiledb.ninja" + targets: "install-devcore compiledb" - name: compile_ninja_next tags: [] @@ -2698,6 +2722,7 @@ tasks: - func: "ninja compile" vars: ninja_file: "build.ninja" + targets: "install-devcore compiledb" - name: compile_build_tools_next tags: [] @@ -8208,6 +8233,11 @@ task_groups: display_name: build.ninja - <<: *compile_task_group_template + name: compile_ninja_quick_TG + tasks: + - compile_ninja_quick + +- <<: *compile_task_group_template name: compile_ninja_default_profile_TG tasks: - compile_ninja_default_profile diff --git a/etc/evergreen_yml_components/variants/compile_static_analysis.yml b/etc/evergreen_yml_components/variants/compile_static_analysis.yml index 406fd52e90d..5416cd6b8a6 100644 --- a/etc/evergreen_yml_components/variants/compile_static_analysis.yml +++ b/etc/evergreen_yml_components/variants/compile_static_analysis.yml @@ -50,6 +50,7 @@ buildvariants: clang_tidy_toolchain: v4 compile_variant: *linux-x86-dynamic-compile-required tasks: + - name: compile_ninja_quick_TG - name: compile_test_and_package_parallel_unittest_stream_TG - name: compile_test_and_package_parallel_core_stream_TG - name: compile_test_and_package_parallel_dbtest_stream_TG @@ -158,6 +159,7 @@ buildvariants: scons_cache_scope: shared compile_variant: *windows-compile-required tasks: + - name: compile_ninja_quick_TG - name: compile_test_and_package_parallel_core_stream_TG - name: compile_test_and_package_parallel_unittest_stream_TG - name: compile_test_and_package_parallel_dbtest_stream_TG diff --git a/evergreen/ninja_compile.sh b/evergreen/ninja_compile.sh index be1da3234de..dcdd8f2ca46 100644 --- a/evergreen/ninja_compile.sh +++ b/evergreen/ninja_compile.sh @@ -7,14 +7,15 @@ set -o errexit set -o verbose activate_venv + if [ "Windows_NT" = "$OS" ]; then vcvars="$(vswhere -latest -property installationPath | tr '\\' '/' | dos2unix.exe)/VC/Auxiliary/Build/" echo "call \"$vcvars/vcvarsall.bat\" amd64" > msvc.bat for i in "${compile_env[@]}"; do echo "set $i" >> msvc.bat done - echo "ninja -f ${ninja_file} install-core" >> msvc.bat + echo "ninja -f ${ninja_file} ${targets}" >> msvc.bat cmd /C msvc.bat else - eval ${compile_env} ninja -f ${ninja_file} install-core compiledb + eval ${compile_env} ninja -f ${ninja_file} ${targets} fi |