Skip to content

Commit 3165a35

Browse files
vector-of-boolvector-of-bool
authored
[CDRIVER-4637] A config settings command (#1289)
* New config settings code and defaults. Almost all setting values have remained the same, and most setting handling logic has remained unmodified, but this will serve as a basis for better configuration settings handling in the future tasks for CDRIVER-4637. * Aside: message() cleanup Using `message()` without a mode argument will write the message as a NOTICE to stderr. We want to use STATUS as the default, which goes to stdout. Systems which colorize stderr output would seemingly-randomly color certain lines where the mode argument was missing. * Use new CMake in more build tasks Several build tasks still relied on older find-cmake logic. With the new CMake changes, a more recent CMake version is required. These tasks and scripts have been updated to use the same logic to find the same CMake version as is used in the main build tasks. * Don't use Batch scripts to compile for MinGW Batch scripting is fraught with peril and will almost never do what one expects. Any other scripting language is preferable. Since we have Bash available and the tools to properly convert paths, just use Bash to do this work. * Redundant ENABLE_SHM_COUNTERS logic * Update the "Ask for Help" section * No longer applicable SASL checks * Remove ENABLE_BSON, as its purpose is confusing. - ENABLE_BSON=ON did the same as ENABLE_BSON=AUTO - There is no "ENABLE_BSON=OFF" since then there would be nothing to build. - USE_SYSTEM_LIBBSON=ON replaces ENABLE_BSON=SYSTEM. - To alleviate downstreams from needing to check versions before configuring, allow ENABLE_BSON=SYSTEM to be specified if USE_SYSTEM_LIBBSON=ON is also set, thus allowing one option pair to build both before and after this revision. - If ENABLE_BSON=SYSTEM is set but USE_SYSTEM_LIBBSON is not TRUE, then downstream will want to update their scripts to build with the new option rather than miscompile without being noticed. * New toolchain for the build * Don't inject the toolchain SSL into LD_LIBRARY_PATH The toolchain CMake is incompatible with OpenSSL 1.1.0, so having it on the library path breaks CMake. We don't need to modify LD_LIBRARY_PATH to cause CMake to use the OpenSSL that we want. It is sufficient to prepend the SSL root to the CMAKE_PREFIX_PATH. * Coverage link options are usage requirements * More Bash, less Sh * Don't depend on distro_id
1 parent 572fd74 commit 3165a35

39 files changed

+840
-280
lines changed

‎.evergreen/config_generator/components/make_release_archive.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ class ReleaseArchive(Function):
2020
'MONGOC_TEST_SKIP_LIVE': 'on',
2121
'MONGOC_TEST_SKIP_SLOW': 'on',
2222
},
23+
include_expansions_in_env=['distro_id'],
2324
script='''\
2425
set -o errexit
2526
bash tools/poetry.sh install --with=docs

‎.evergreen/config_generator/etc/utils.py

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
from importlib import import_module
22
from pathlib import Path
33
from textwrap import dedent
4-
from typing import Sequence
4+
from typing import Sequence, Iterable, Mapping
55

66
import yaml
77

88
from shrub.v3.evg_project import EvgProject
99
from shrub.v3.evg_task import EvgTask
10-
from shrub.v3.evg_command import subprocess_exec
10+
from shrub.v3.evg_command import subprocess_exec, EvgCommandType
1111

1212

1313
# Equivalent to EvgTask but defines additional properties.
@@ -23,11 +23,23 @@ class Task(EvgTask):
2323

2424

2525
# Automatically formats the provided script and invokes it in Bash.
26-
def bash_exec(script, **kwargs):
26+
def bash_exec(
27+
script,
28+
*,
29+
include_expansions_in_env: Iterable[str] | None = None,
30+
working_dir: str | None = None,
31+
command_type: EvgCommandType | None = None,
32+
env: Mapping[str, str] | None = None,
33+
**kwargs,
34+
):
2735
return subprocess_exec(
28-
binary='bash',
29-
args=['-c', dedent(script)],
30-
**kwargs
36+
binary="bash",
37+
args=["-c", dedent(script)],
38+
include_expansions_in_env=list(include_expansions_in_env) if include_expansions_in_env else None,
39+
working_dir=working_dir,
40+
command_type=command_type,
41+
env=dict(env) if env else None,
42+
**kwargs,
3143
)
3244

3345

‎.evergreen/etc/mongo-c-driver.spec

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,6 @@ Documentation: http://mongoc.org/libbson/%{version}/
118118

119119
%build
120120
%cmake \
121-
-DENABLE_BSON:STRING=ON \
122121
-DENABLE_MONGOC:BOOL=ON \
123122
-DENABLE_SHM_COUNTERS:BOOL=ON \
124123
-DENABLE_SSL:STRING=OPENSSL \

‎.evergreen/generated_configs/functions.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -280,6 +280,8 @@ functions:
280280
MONGOC_TEST_FUTURE_TIMEOUT_MS: "30000"
281281
MONGOC_TEST_SKIP_LIVE: "on"
282282
MONGOC_TEST_SKIP_SLOW: "on"
283+
include_expansions_in_env:
284+
- distro_id
283285
args:
284286
- -c
285287
- |

‎.evergreen/generated_configs/legacy-config.yml

Lines changed: 48 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,8 @@ functions:
8686
type: test
8787
params:
8888
working_dir: mongoc
89+
include_expansions_in_env:
90+
- distro_id
8991
shell: bash
9092
script: |-
9193
set -o errexit
@@ -95,29 +97,33 @@ functions:
9597
export BUILD_SAMPLE_WITH_CMAKE_DEPRECATED=${BUILD_SAMPLE_WITH_CMAKE_DEPRECATED}
9698
export ENABLE_SSL=${ENABLE_SSL}
9799
export ENABLE_SNAPPY=${ENABLE_SNAPPY}
98-
LINK_STATIC= sh .evergreen/scripts/link-sample-program.sh
99-
LINK_STATIC=1 sh .evergreen/scripts/link-sample-program.sh
100+
LINK_STATIC= bash .evergreen/scripts/link-sample-program.sh
101+
LINK_STATIC=1 bash .evergreen/scripts/link-sample-program.sh
100102
link sample program bson:
101103
- command: shell.exec
102104
type: test
103105
params:
104106
working_dir: mongoc
107+
include_expansions_in_env:
108+
- distro_id
105109
shell: bash
106110
script: |-
107111
set -o errexit
108112
# Compile a program that links dynamically or statically to libbson,
109113
# using variables from pkg-config or from CMake's find_package command.
110-
BUILD_SAMPLE_WITH_CMAKE= BUILD_SAMPLE_WITH_CMAKE_DEPRECATED= LINK_STATIC= sh .evergreen/scripts/link-sample-program-bson.sh
111-
BUILD_SAMPLE_WITH_CMAKE= BUILD_SAMPLE_WITH_CMAKE_DEPRECATED= LINK_STATIC=1 sh .evergreen/scripts/link-sample-program-bson.sh
112-
BUILD_SAMPLE_WITH_CMAKE=1 BUILD_SAMPLE_WITH_CMAKE_DEPRECATED= LINK_STATIC= sh .evergreen/scripts/link-sample-program-bson.sh
113-
BUILD_SAMPLE_WITH_CMAKE=1 BUILD_SAMPLE_WITH_CMAKE_DEPRECATED= LINK_STATIC=1 sh .evergreen/scripts/link-sample-program-bson.sh
114-
BUILD_SAMPLE_WITH_CMAKE=1 BUILD_SAMPLE_WITH_CMAKE_DEPRECATED=1 LINK_STATIC= sh .evergreen/scripts/link-sample-program-bson.sh
115-
BUILD_SAMPLE_WITH_CMAKE=1 BUILD_SAMPLE_WITH_CMAKE_DEPRECATED=1 LINK_STATIC=1 sh .evergreen/scripts/link-sample-program-bson.sh
114+
BUILD_SAMPLE_WITH_CMAKE= BUILD_SAMPLE_WITH_CMAKE_DEPRECATED= LINK_STATIC= bash .evergreen/scripts/link-sample-program-bson.sh
115+
BUILD_SAMPLE_WITH_CMAKE= BUILD_SAMPLE_WITH_CMAKE_DEPRECATED= LINK_STATIC=1 bash .evergreen/scripts/link-sample-program-bson.sh
116+
BUILD_SAMPLE_WITH_CMAKE=1 BUILD_SAMPLE_WITH_CMAKE_DEPRECATED= LINK_STATIC= bash .evergreen/scripts/link-sample-program-bson.sh
117+
BUILD_SAMPLE_WITH_CMAKE=1 BUILD_SAMPLE_WITH_CMAKE_DEPRECATED= LINK_STATIC=1 bash .evergreen/scripts/link-sample-program-bson.sh
118+
BUILD_SAMPLE_WITH_CMAKE=1 BUILD_SAMPLE_WITH_CMAKE_DEPRECATED=1 LINK_STATIC= bash .evergreen/scripts/link-sample-program-bson.sh
119+
BUILD_SAMPLE_WITH_CMAKE=1 BUILD_SAMPLE_WITH_CMAKE_DEPRECATED=1 LINK_STATIC=1 bash .evergreen/scripts/link-sample-program-bson.sh
116120
link sample program MSVC:
117121
- command: shell.exec
118122
type: test
119123
params:
120124
working_dir: mongoc
125+
include_expansions_in_env:
126+
- distro_id
121127
shell: bash
122128
script: |-
123129
set -o errexit
@@ -126,24 +132,34 @@ functions:
126132
# find_package command.
127133
export ENABLE_SSL=${ENABLE_SSL}
128134
export ENABLE_SNAPPY=${ENABLE_SNAPPY}
135+
. .evergreen/scripts/use-tools.sh paths
136+
. .evergreen/scripts/find-cmake-latest.sh
137+
export CMAKE="$(native-path "$(find_cmake_latest)")"
129138
LINK_STATIC= cmd.exe /c .\\.evergreen\\scripts\\link-sample-program-msvc.cmd
130139
LINK_STATIC=1 cmd.exe /c .\\.evergreen\\scripts\\link-sample-program-msvc.cmd
131140
link sample program mingw:
132141
- command: shell.exec
133142
type: test
134143
params:
135144
working_dir: mongoc
145+
include_expansions_in_env:
146+
- distro_id
136147
shell: bash
137148
script: |-
138149
set -o errexit
139150
# Build libmongoc with CMake and compile a program that links
140151
# dynamically to it, using variables from pkg-config.exe.
152+
. .evergreen/scripts/use-tools.sh paths
153+
. .evergreen/scripts/find-cmake-latest.sh
154+
export CMAKE="$(native-path "$(find_cmake_latest)")"
141155
cmd.exe /c .\\.evergreen\\scripts\\link-sample-program-mingw.cmd
142156
link sample program MSVC bson:
143157
- command: shell.exec
144158
type: test
145159
params:
146160
working_dir: mongoc
161+
include_expansions_in_env:
162+
- distro_id
147163
shell: bash
148164
script: |-
149165
set -o errexit
@@ -152,6 +168,9 @@ functions:
152168
# find_package command.
153169
export ENABLE_SSL=${ENABLE_SSL}
154170
export ENABLE_SNAPPY=${ENABLE_SNAPPY}
171+
. .evergreen/scripts/use-tools.sh paths
172+
. .evergreen/scripts/find-cmake-latest.sh
173+
export CMAKE="$(native-path "$(find_cmake_latest)")"
155174
LINK_STATIC= cmd.exe /c .\\.evergreen\\scripts\\link-sample-program-msvc-bson.cmd
156175
LINK_STATIC=1 cmd.exe /c .\\.evergreen\\scripts\\link-sample-program-msvc-bson.cmd
157176
link sample program mingw bson:
@@ -164,6 +183,9 @@ functions:
164183
set -o errexit
165184
# Build libmongoc with CMake and compile a program that links
166185
# dynamically to it, using variables from pkg-config.exe.
186+
. .evergreen/scripts/use-tools.sh paths
187+
. .evergreen/scripts/find-cmake-latest.sh
188+
export CMAKE="$(native-path "$(find_cmake_latest)")"
167189
cmd.exe /c .\\.evergreen\\scripts\\link-sample-program-mingw-bson.cmd
168190
update codecov.io:
169191
- command: shell.exec
@@ -201,7 +223,7 @@ functions:
201223
set -o errexit
202224
cd drivers-evergreen-tools
203225
export DRIVERS_TOOLS=$(pwd)
204-
sh .evergreen/atlas_data_lake/build-mongohouse-local.sh
226+
bash .evergreen/atlas_data_lake/build-mongohouse-local.sh
205227
run mongohouse:
206228
- command: shell.exec
207229
type: test
@@ -212,7 +234,7 @@ functions:
212234
set -o errexit
213235
cd drivers-evergreen-tools
214236
export DRIVERS_TOOLS=$(pwd)
215-
sh .evergreen/atlas_data_lake/run-mongohouse-local.sh
237+
bash .evergreen/atlas_data_lake/run-mongohouse-local.sh
216238
test mongohouse:
217239
- command: shell.exec
218240
type: test
@@ -962,9 +984,13 @@ tasks:
962984
type: test
963985
params:
964986
working_dir: mongoc
987+
include_expansions_in_env:
988+
- distro_id
965989
shell: bash
966990
script: |-
967991
set -o errexit
992+
. .evergreen/scripts/find-cmake-latest.sh
993+
export CMAKE="$(find_cmake_latest)"
968994
export CC="C:/mingw-w64/x86_64-4.9.1-posix-seh-rt_v3-rev1/mingw64/bin/gcc.exe"
969995
BSON_ONLY=1 cmd.exe /c .\\.evergreen\\scripts\\install-uninstall-check-windows.cmd
970996
cmd.exe /c .\\.evergreen\\scripts\\install-uninstall-check-windows.cmd
@@ -977,9 +1003,13 @@ tasks:
9771003
type: test
9781004
params:
9791005
working_dir: mongoc
1006+
include_expansions_in_env:
1007+
- distro_id
9801008
shell: bash
9811009
script: |-
9821010
set -o errexit
1011+
. .evergreen/scripts/find-cmake-latest.sh
1012+
export CMAKE="$(find_cmake_latest)"
9831013
export CC="Visual Studio 14 2015 Win64"
9841014
BSON_ONLY=1 cmd.exe /c .\\.evergreen\\scripts\\install-uninstall-check-windows.cmd
9851015
cmd.exe /c .\\.evergreen\\scripts\\install-uninstall-check-windows.cmd
@@ -992,12 +1022,16 @@ tasks:
9921022
type: test
9931023
params:
9941024
working_dir: mongoc
1025+
include_expansions_in_env:
1026+
- distro_id
9951027
shell: bash
9961028
script: |-
9971029
set -o errexit
998-
DESTDIR="$(pwd)/dest" sh ./.evergreen/scripts/install-uninstall-check.sh
999-
BSON_ONLY=1 sh ./.evergreen/scripts/install-uninstall-check.sh
1000-
sh ./.evergreen/scripts/install-uninstall-check.sh
1030+
. .evergreen/scripts/find-cmake-latest.sh
1031+
export CMAKE="$(find_cmake_latest)"
1032+
DESTDIR="$(pwd)/dest" bash ./.evergreen/scripts/install-uninstall-check.sh
1033+
BSON_ONLY=1 bash ./.evergreen/scripts/install-uninstall-check.sh
1034+
bash ./.evergreen/scripts/install-uninstall-check.sh
10011035
- name: debug-compile-with-warnings
10021036
commands:
10031037
- command: shell.exec
@@ -1049,7 +1083,7 @@ tasks:
10491083
params:
10501084
aws_key: ${toolchain_aws_key}
10511085
aws_secret: ${toolchain_aws_secret}
1052-
remote_file: mongo-c-toolchain/${distro_id}/mongo-c-toolchain.tar.gz
1086+
remote_file: mongo-c-toolchain/${distro_id}/2023/06/07/mongo-c-toolchain.tar.gz
10531087
bucket: mongo-c-toolchain
10541088
local_file: mongo-c-toolchain.tar.gz
10551089
- command: shell.exec

‎.evergreen/legacy_config_generator/evergreen_config_generator/functions.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515
from collections import OrderedDict as OD
1616
from textwrap import dedent
17+
from typing import Iterable
1718

1819
from evergreen_config_generator import ConfigObject
1920

@@ -67,6 +68,7 @@ def shell_exec(
6768
background: bool = False,
6869
add_expansions_to_env: bool = False,
6970
redirect_standard_error_to_output: bool = False,
71+
include_expansions_in_env: Iterable[str] = (),
7072
) -> ValueMapping:
7173
dedented = ""
7274
if errexit:
@@ -99,6 +101,9 @@ def shell_exec(
99101
if redirect_standard_error_to_output:
100102
command["params"]["redirect_standard_error_to_output"] = True
101103

104+
if include_expansions_in_env:
105+
command["params"]["include_expansions_in_env"] = list(include_expansions_in_env)
106+
102107
command["params"]["shell"] = "bash"
103108
command["params"]["script"] = dedented
104109
return command

‎.evergreen/legacy_config_generator/evergreen_config_lib/__init__.py

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15+
from typing import Iterable
1516
from evergreen_config_generator.functions import shell_exec
1617

1718

@@ -25,6 +26,7 @@ def shell_mongoc(
2526
background: bool = False,
2627
add_expansions_to_env: bool = False,
2728
redirect_standard_error_to_output: bool = False,
29+
include_expansions_in_env: Iterable[str] = (),
2830
):
2931
return shell_exec(
3032
script,
@@ -36,5 +38,6 @@ def shell_mongoc(
3638
continue_on_err=continue_on_err,
3739
background=background,
3840
add_expansions_to_env=add_expansions_to_env,
41+
include_expansions_in_env=include_expansions_in_env,
3942
redirect_standard_error_to_output=redirect_standard_error_to_output,
4043
)

‎.evergreen/legacy_config_generator/evergreen_config_lib/functions.py

Lines changed: 32 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -70,21 +70,23 @@
7070
export BUILD_SAMPLE_WITH_CMAKE_DEPRECATED=${BUILD_SAMPLE_WITH_CMAKE_DEPRECATED}
7171
export ENABLE_SSL=${ENABLE_SSL}
7272
export ENABLE_SNAPPY=${ENABLE_SNAPPY}
73-
LINK_STATIC= sh .evergreen/scripts/link-sample-program.sh
74-
LINK_STATIC=1 sh .evergreen/scripts/link-sample-program.sh
75-
'''),
73+
LINK_STATIC= bash .evergreen/scripts/link-sample-program.sh
74+
LINK_STATIC=1 bash .evergreen/scripts/link-sample-program.sh
75+
''',
76+
include_expansions_in_env=['distro_id']),
7677
)),
7778
('link sample program bson', Function(
7879
shell_mongoc(r'''
7980
# Compile a program that links dynamically or statically to libbson,
8081
# using variables from pkg-config or from CMake's find_package command.
81-
BUILD_SAMPLE_WITH_CMAKE= BUILD_SAMPLE_WITH_CMAKE_DEPRECATED= LINK_STATIC= sh .evergreen/scripts/link-sample-program-bson.sh
82-
BUILD_SAMPLE_WITH_CMAKE= BUILD_SAMPLE_WITH_CMAKE_DEPRECATED= LINK_STATIC=1 sh .evergreen/scripts/link-sample-program-bson.sh
83-
BUILD_SAMPLE_WITH_CMAKE=1 BUILD_SAMPLE_WITH_CMAKE_DEPRECATED= LINK_STATIC= sh .evergreen/scripts/link-sample-program-bson.sh
84-
BUILD_SAMPLE_WITH_CMAKE=1 BUILD_SAMPLE_WITH_CMAKE_DEPRECATED= LINK_STATIC=1 sh .evergreen/scripts/link-sample-program-bson.sh
85-
BUILD_SAMPLE_WITH_CMAKE=1 BUILD_SAMPLE_WITH_CMAKE_DEPRECATED=1 LINK_STATIC= sh .evergreen/scripts/link-sample-program-bson.sh
86-
BUILD_SAMPLE_WITH_CMAKE=1 BUILD_SAMPLE_WITH_CMAKE_DEPRECATED=1 LINK_STATIC=1 sh .evergreen/scripts/link-sample-program-bson.sh
87-
'''),
82+
BUILD_SAMPLE_WITH_CMAKE= BUILD_SAMPLE_WITH_CMAKE_DEPRECATED= LINK_STATIC= bash .evergreen/scripts/link-sample-program-bson.sh
83+
BUILD_SAMPLE_WITH_CMAKE= BUILD_SAMPLE_WITH_CMAKE_DEPRECATED= LINK_STATIC=1 bash .evergreen/scripts/link-sample-program-bson.sh
84+
BUILD_SAMPLE_WITH_CMAKE=1 BUILD_SAMPLE_WITH_CMAKE_DEPRECATED= LINK_STATIC= bash .evergreen/scripts/link-sample-program-bson.sh
85+
BUILD_SAMPLE_WITH_CMAKE=1 BUILD_SAMPLE_WITH_CMAKE_DEPRECATED= LINK_STATIC=1 bash .evergreen/scripts/link-sample-program-bson.sh
86+
BUILD_SAMPLE_WITH_CMAKE=1 BUILD_SAMPLE_WITH_CMAKE_DEPRECATED=1 LINK_STATIC= bash .evergreen/scripts/link-sample-program-bson.sh
87+
BUILD_SAMPLE_WITH_CMAKE=1 BUILD_SAMPLE_WITH_CMAKE_DEPRECATED=1 LINK_STATIC=1 bash .evergreen/scripts/link-sample-program-bson.sh
88+
''',
89+
include_expansions_in_env=['distro_id']),
8890
)),
8991
('link sample program MSVC', Function(
9092
shell_mongoc(r'''
@@ -93,16 +95,24 @@
9395
# find_package command.
9496
export ENABLE_SSL=${ENABLE_SSL}
9597
export ENABLE_SNAPPY=${ENABLE_SNAPPY}
98+
. .evergreen/scripts/use-tools.sh paths
99+
. .evergreen/scripts/find-cmake-latest.sh
100+
export CMAKE="$(native-path "$(find_cmake_latest)")"
96101
LINK_STATIC= cmd.exe /c .\\.evergreen\\scripts\\link-sample-program-msvc.cmd
97102
LINK_STATIC=1 cmd.exe /c .\\.evergreen\\scripts\\link-sample-program-msvc.cmd
98-
'''),
103+
''',
104+
include_expansions_in_env=['distro_id']),
99105
)),
100106
('link sample program mingw', Function(
101107
shell_mongoc(r'''
102108
# Build libmongoc with CMake and compile a program that links
103109
# dynamically to it, using variables from pkg-config.exe.
110+
. .evergreen/scripts/use-tools.sh paths
111+
. .evergreen/scripts/find-cmake-latest.sh
112+
export CMAKE="$(native-path "$(find_cmake_latest)")"
104113
cmd.exe /c .\\.evergreen\\scripts\\link-sample-program-mingw.cmd
105-
'''),
114+
''',
115+
include_expansions_in_env=['distro_id']),
106116
)),
107117
('link sample program MSVC bson', Function(
108118
shell_mongoc(r'''
@@ -111,14 +121,21 @@
111121
# find_package command.
112122
export ENABLE_SSL=${ENABLE_SSL}
113123
export ENABLE_SNAPPY=${ENABLE_SNAPPY}
124+
. .evergreen/scripts/use-tools.sh paths
125+
. .evergreen/scripts/find-cmake-latest.sh
126+
export CMAKE="$(native-path "$(find_cmake_latest)")"
114127
LINK_STATIC= cmd.exe /c .\\.evergreen\\scripts\\link-sample-program-msvc-bson.cmd
115128
LINK_STATIC=1 cmd.exe /c .\\.evergreen\\scripts\\link-sample-program-msvc-bson.cmd
116-
'''),
129+
''',
130+
include_expansions_in_env=['distro_id']),
117131
)),
118132
('link sample program mingw bson', Function(
119133
shell_mongoc(r'''
120134
# Build libmongoc with CMake and compile a program that links
121135
# dynamically to it, using variables from pkg-config.exe.
136+
. .evergreen/scripts/use-tools.sh paths
137+
. .evergreen/scripts/find-cmake-latest.sh
138+
export CMAKE="$(native-path "$(find_cmake_latest)")"
122139
cmd.exe /c .\\.evergreen\\scripts\\link-sample-program-mingw-bson.cmd
123140
'''),
124141
)),
@@ -145,14 +162,14 @@
145162
shell_exec(r'''
146163
cd drivers-evergreen-tools
147164
export DRIVERS_TOOLS=$(pwd)
148-
sh .evergreen/atlas_data_lake/build-mongohouse-local.sh
165+
bash .evergreen/atlas_data_lake/build-mongohouse-local.sh
149166
'''),
150167
)),
151168
('run mongohouse', Function(
152169
shell_exec(r'''
153170
cd drivers-evergreen-tools
154171
export DRIVERS_TOOLS=$(pwd)
155-
sh .evergreen/atlas_data_lake/run-mongohouse-local.sh
172+
bash .evergreen/atlas_data_lake/run-mongohouse-local.sh
156173
''', background=True),
157174
)),
158175
('test mongohouse', Function(

0 commit comments

Comments
 (0)