Skip to content

Commit 0d9c7f9

Browse files
committed
fix
1 parent 8447bbf commit 0d9c7f9

2 files changed

Lines changed: 7 additions & 7 deletions

File tree

automated_packaging/prepare_release.pl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ sub cherry_pick_commits {
5252
`git checkout -b release-$minor_version`;
5353

5454
# Update the version on the configuration file
55-
`sed -i 's/$current_version_escape_dot/$NEW_VERSION/g' configure.in`;
55+
`sed -i 's/$current_version_escape_dot/$NEW_VERSION/g' configure.ac`;
5656

5757
# Run autoconf to generate new configure file
5858
`autoconf -f`;
@@ -73,7 +73,7 @@ sub cherry_pick_commits {
7373
`git checkout -b master-update-version-$curTime`;
7474

7575
# Update the version on the configuration file
76-
`sed -i 's/$current_version_escape_dot/$UPCOMING_VERSION/g' configure.in`;
76+
`sed -i 's/$current_version_escape_dot/$UPCOMING_VERSION/g' configure.ac`;
7777

7878
# Update the version on the config.py file (for upgrade tests)
7979
`sed -i 's/$minor_version_escape_dot/$upcoming_minor_version/g' ./src/test/regress/upgrade/config.py`;
@@ -144,7 +144,7 @@ sub cherry_pick_commits {
144144
$current_version_escape_dot =~ s/[^0-9]/\\./g;
145145

146146
# Update configuration file
147-
`sed -i 's/$current_version_escape_dot/$NEW_VERSION/g' configure.in`;
147+
`sed -i 's/$current_version_escape_dot/$NEW_VERSION/g' configure.ac`;
148148

149149
# Run autoconf to generate new configure file
150150
`autoconf`;

packaging_automation/prepare_release.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
CONFIG_PY = "src/test/regress/upgrade/config.py"
2626
DISTRIBUTED_SQL_DIR_PATH = "src/backend/distributed/sql"
2727
DOWNGRADES_DIR_PATH = f"{DISTRIBUTED_SQL_DIR_PATH}/downgrades"
28-
CONFIGURE_IN = "configure.in"
28+
CONFIGURE_IN = "configure.ac"
2929
CONFIGURE = "configure"
3030
CITUS_CONTROL_SEARCH_PATTERN = r"^default_version*"
3131

@@ -262,7 +262,7 @@ def prepare_release_branch_for_patch_release(patchReleaseParams: PatchReleasePar
262262
run(f"git checkout -b {patchReleaseParams.release_branch_name}")
263263
else:
264264
checkout_branch(patchReleaseParams.release_branch_name, patchReleaseParams.is_test)
265-
# change version info in configure.in file
265+
# change version info in configure.ac file
266266
update_version_in_configure_in(patchReleaseParams.project_name, patchReleaseParams.configure_in_path,
267267
patchReleaseParams.project_version)
268268
# execute "auto-conf "
@@ -295,7 +295,7 @@ def prepare_upcoming_version_branch(upcoming_params: UpcomingVersionBranchParams
295295
checkout_branch(upcoming_params.main_branch, upcoming_params.is_test)
296296
# create master-update-version-$curtime branch
297297
create_and_checkout_branch(upcoming_params.upcoming_version_branch)
298-
# update version info with upcoming version on configure.in
298+
# update version info with upcoming version on configure.ac
299299
update_version_in_configure_in(upcoming_params.project_name, upcoming_params.configure_in_path,
300300
upcoming_params.upcoming_devel_version)
301301
# update version info with upcoming version on config.py
@@ -351,7 +351,7 @@ def prepare_release_branch_for_major_release(majorReleaseParams: MajorReleasePar
351351
checkout_branch(majorReleaseParams.main_branch, majorReleaseParams.is_test)
352352
# create release branch in release-X.Y format
353353
create_and_checkout_branch(majorReleaseParams.release_branch_name)
354-
# change version info in configure.in file
354+
# change version info in configure.ac file
355355
update_version_in_configure_in(majorReleaseParams.project_name, majorReleaseParams.configure_in_path,
356356
majorReleaseParams.project_version)
357357
# execute "autoconf -f"

0 commit comments

Comments
 (0)