diff options
| author | Daniel Moody <daniel.moody@mongodb.com> | 2021-03-03 15:55:19 +0000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2021-03-05 19:52:11 +0000 |
| commit | 7739da6997795c20924580087a0e09db0a8cf929 (patch) | |
| tree | 0349a8a0c20ba669d95ad0379db742f749c636d4 /etc | |
| parent | 7676194fd8a363c7c9f3099e814dc71bbe401efb (diff) | |
| download | mongo-7739da6997795c20924580087a0e09db0a8cf929.tar.gz | |
SERVER-48203 setup ninja install actions rule, make evergreen fail correctly on ninja, add precious handling
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/evergreen.yml | 39 |
1 files changed, 22 insertions, 17 deletions
diff --git a/etc/evergreen.yml b/etc/evergreen.yml index abdd66cc5b4..2640228e7b1 100644 --- a/etc/evergreen.yml +++ b/etc/evergreen.yml @@ -1846,7 +1846,7 @@ functions: # for tasks that don't support the one we set here. A better plan would be # to support install-action for Ninja builds directly. # TODO: https://jira.mongodb.org/browse/SERVER-48203 - extra_args="--install-action=${task_install_action|hardlink}" + extra_args="--install-action=hardlink" # By default, limit link jobs to one quarter of our overall -j # concurrency unless locally overridden. We do this because in @@ -1899,8 +1899,8 @@ functions: ${compile_env|} $python ./buildscripts/scons.py \ ${compile_flags|} ${task_compile_flags|} ${task_compile_flags_extra|} \ - ${scons_cache_args|} $extra_args \ - ${targets} MONGO_VERSION=${version} ${patch_compile_flags|} || exit_status=$? + ${scons_cache_args|} $extra_args MONGO_VERSION=${version} \ + ${patch_compile_flags|} ${targets} || exit_status=$? chmod -R ugo+w ./src ls -la src/mongo/stdx/sigaltstack_location_test.cpp || true @@ -3387,31 +3387,33 @@ tasks: commands: - func: "scons compile" vars: - task_install_action: - default task_compile_flags: >- --ninja targets: - build.ninja + generate-ninja - command: shell.exec params: working_dir: src shell: bash script: | + set -o errexit + set -o verbose + ${activate_virtualenv} + python -m pip install ninja if [ "Windows_NT" = "$OS" ]; then vcvars="$(vswhere -latest -property installationPath | tr '\\' '/' | dos2unix.exe)/VC/Auxiliary/Build/" - cd "$vcvars" && cmd /K "vcvarsall.bat amd64 && cd ${workdir}\src" + echo "call \"$vcvars/vcvarsall.bat\" amd64" > msvc.bat + echo "ninja install-core" >> msvc.bat + cmd /C msvc.bat + else + ninja install-core fi - python -m pip install ninja - ninja install-core - name: compile_ninja_next commands: - func: "scons compile" vars: - task_install_action: - default task_compile_flags: >- --build-tools=next --ninja @@ -3422,21 +3424,24 @@ tasks: working_dir: src shell: bash script: | + set -o errexit + set -o verbose + ${activate_virtualenv} + python -m pip install ninja if [ "Windows_NT" = "$OS" ]; then vcvars="$(vswhere -latest -property installationPath | tr '\\' '/' | dos2unix.exe)/VC/Auxiliary/Build/" - cd "$vcvars" && cmd /K "vcvarsall.bat amd64 && cd ${workdir}\src" + echo "call \"$vcvars/vcvarsall.bat\" amd64" > msvc.bat + echo "ninja install-core" >> msvc.bat + cmd /C msvc.bat + else + ninja install-core fi - python -m pip install ninja - ninja install-core - - name: compile_build_tools_next commands: - func: "scons compile" vars: - task_install_action: - default task_compile_flags: >- --build-tools=next targets: |