Skip to content

Commit 2a11882

Browse files
authored
Fix runtime errors during execution of etc/make_release.py (#1280)
1 parent 924c174 commit 2a11882

File tree

5 files changed

+22
-158
lines changed

5 files changed

+22
-158
lines changed

cmake/make_dist/MakeDistCheck.cmake

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ function(RUN_DIST_CHECK PACKAGE_PREFIX EXT)
6060
-S ../${PACKAGE_PREFIX}
6161
-B .
6262
-DCMAKE_BUILD_TYPE=Release
63+
-DENABLE_TESTS=ON
6364
-DMONGOCXX_ENABLE_SLOW_TESTS=ON
6465
-DCMAKE_PREFIX_PATH=${CMAKE_PREFIX_PATH}
6566
-DCMAKE_INSTALL_PREFIX=../${INSTALL_DIR}

etc/make_release.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -407,7 +407,7 @@ def build_c_driver(c_driver_build_ref, quiet):
407407

408408
env = os.environ.copy()
409409
env['mongoc_version'] = c_driver_build_ref
410-
run_shell_script('./.evergreen/scripts/install_c_driver.sh', env=env)
410+
run_shell_script('./.evergreen/scripts/install-c-driver.sh', env=env)
411411

412412
if not quiet:
413413
click.echo('Build of C Driver version "{}" was successful.'.format(c_driver_build_ref))
@@ -441,7 +441,7 @@ def build_distribution(release_tag, release_version, c_driver_dir, quiet, skip_d
441441
run_shell_script('. .evergreen/scripts/find-cmake-old.sh;'
442442
'cd build;'
443443
'echo ' + release_version + ' > VERSION_CURRENT;'
444-
'${CMAKE} -DCMAKE_BUILD_TYPE=Release '
444+
'${CMAKE} -DCMAKE_BUILD_TYPE=Release -DENABLE_TESTS=ON '
445445
'-DCMAKE_PREFIX_PATH="' + c_driver_dir + '" '
446446
'-DENABLE_UNINSTALL=ON ..;'
447447
'cmake --build . --target dist')

etc/releasing.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -413,6 +413,7 @@ Run the release script with the git tag created above as an argument and
413413
make_release_args=(
414414
--jira-creds-file ~/.secrets/jira-creds.txt
415415
--github-token-file ~/.secrets/github-token.txt
416+
-r upstream # Only if mongodb/mongo-cxx-driver is not "origin".
416417
)
417418
python ./etc/make_release.py "${make_release_args[@]:?}" --dry-run rX.Y.Z
418419
```

pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name = "mongo-cxx-driver"
33
version = "0.1.0"
44
description = "For development only."
5-
requires-python = ">=3.10"
5+
requires-python = ">=3.10,<3.12"
66
dependencies = []
77

88
[dependency-groups]
@@ -12,7 +12,7 @@ dev = [
1212
"pydantic>=2.7",
1313
"shrub-py>=3.4.0",
1414

15-
# etc/make_release.py
15+
# etc/make_release.py (requires python<3.12)
1616
"click>=6.0",
1717
"gitpython>=3.1",
1818
"jira>=3.1",

0 commit comments

Comments
 (0)