diff options
author | Trevor Guidry <trevor.guidry@mongodb.com> | 2022-11-30 19:49:11 +0000 |
---|---|---|
committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2022-11-30 20:22:54 +0000 |
commit | 2f0387a611995f79e935a666e60ea43d16440316 (patch) | |
tree | 3d202fe7c4dcecd7c698a5737b000bd081ec4273 | |
parent | 1b48004aa0904b8e7610770fe3ab14812923ae9b (diff) | |
download | mongo-2f0387a611995f79e935a666e60ea43d16440316.tar.gz |
SERVER-71681 restore default linux build-profile behavior
-rw-r--r-- | etc/evergreen_yml_components/definitions.yml | 24 | ||||
-rw-r--r-- | etc/evergreen_yml_components/variants/ninja.yml | 2 | ||||
-rw-r--r-- | site_scons/mongo/build_profiles.py | 2 |
3 files changed, 26 insertions, 2 deletions
diff --git a/etc/evergreen_yml_components/definitions.yml b/etc/evergreen_yml_components/definitions.yml index 936bb57c918..97a1ce2c293 100644 --- a/etc/evergreen_yml_components/definitions.yml +++ b/etc/evergreen_yml_components/definitions.yml @@ -2499,6 +2499,25 @@ tasks: vars: ninja_file: "build.ninja" +- name: compile_ninja_default_profile_linux + 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: >- + --build-profile=default + --variables-files=etc/scons/mongodbtoolchain_stable_clang.vars + --ninja + - *f_expansions_write + - func: "ninja compile" + vars: + ninja_file: "build.ninja" + - name: compile_ninja_opt_profile tags: [] depends_on: @@ -7984,6 +8003,11 @@ task_groups: - compile_ninja_default_profile - <<: *compile_task_group_template + name: compile_ninja_default_profile_linux_TG + tasks: + - compile_ninja_default_profile_linux + +- <<: *compile_task_group_template name: compile_ninja_opt_profile_TG tasks: - compile_ninja_opt_profile diff --git a/etc/evergreen_yml_components/variants/ninja.yml b/etc/evergreen_yml_components/variants/ninja.yml index b70caf83403..7315e898b61 100644 --- a/etc/evergreen_yml_components/variants/ninja.yml +++ b/etc/evergreen_yml_components/variants/ninja.yml @@ -98,7 +98,7 @@ buildvariants: has_packages: false compile_variant: ubuntu1804-ninja-build-profiles tasks: - - name: compile_ninja_default_profile_TG + - name: compile_ninja_default_profile_linux_TG distros: - ubuntu1804-xlarge - name: compile_ninja_opt_profile_TG diff --git a/site_scons/mongo/build_profiles.py b/site_scons/mongo/build_profiles.py index 3481f50e9ef..3b5cc2e0584 100644 --- a/site_scons/mongo/build_profiles.py +++ b/site_scons/mongo/build_profiles.py @@ -62,7 +62,7 @@ LINUX_BUILD_PROFILES = { BuildProfileType.DEFAULT: BuildProfile( ninja="disabled", - variables_files=['./etc/scons/mongodbtoolchain_stable_gcc.vars'], + variables_files=[], allocator="auto", sanitize=None, link_model="auto", |