fix

citusdata · Sep 16, 2022 · 2b9a23c · 2b9a23c
1 parent 1bdd130
commit 2b9a23c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/automated_packaging/prepare_release.pl b/automated_packaging/prepare_release.pl
@@ -52,7 +52,7 @@ sub cherry_pick_commits {
     `git checkout -b release-$minor_version`;
 
     # Update the version on the configuration file
-    `sed -i 's/$current_version_escape_dot/$NEW_VERSION/g' configure.in`;
+    `sed -i 's/$current_version_escape_dot/$NEW_VERSION/g' configure.ac`;
 
     # Run autoconf to generate new configure file
     `autoconf -f`;
@@ -73,7 +73,7 @@ sub cherry_pick_commits {
     `git checkout -b master-update-version-$curTime`;
 
     # Update the version on the configuration file
-    `sed -i 's/$current_version_escape_dot/$UPCOMING_VERSION/g' configure.in`;
+    `sed -i 's/$current_version_escape_dot/$UPCOMING_VERSION/g' configure.ac`;
 
     # Update the version on the config.py file (for upgrade tests)
     `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 {
     $current_version_escape_dot =~ s/[^0-9]/\\./g;
 
     # Update configuration file
-    `sed -i 's/$current_version_escape_dot/$NEW_VERSION/g' configure.in`;
+    `sed -i 's/$current_version_escape_dot/$NEW_VERSION/g' configure.ac`;
 
     # Run autoconf to generate new configure file
     `autoconf`;

diff --git a/packaging_automation/prepare_release.py b/packaging_automation/prepare_release.py
@@ -25,7 +25,7 @@
 CONFIG_PY = "src/test/regress/upgrade/config.py"
 DISTRIBUTED_SQL_DIR_PATH = "src/backend/distributed/sql"
 DOWNGRADES_DIR_PATH = f"{DISTRIBUTED_SQL_DIR_PATH}/downgrades"
-CONFIGURE_IN = "configure.in"
+CONFIGURE_IN = "configure.ac"
 CONFIGURE = "configure"
 CITUS_CONTROL_SEARCH_PATTERN = r"^default_version*"
 
@@ -262,7 +262,7 @@ def prepare_release_branch_for_patch_release(patchReleaseParams: PatchReleasePar
             run(f"git checkout -b  {patchReleaseParams.release_branch_name}")
     else:
         checkout_branch(patchReleaseParams.release_branch_name, patchReleaseParams.is_test)
-    # change version info in configure.in file
+    # change version info in configure.ac file
     update_version_in_configure_in(patchReleaseParams.project_name, patchReleaseParams.configure_in_path,
                                    patchReleaseParams.project_version)
     # execute "auto-conf "
@@ -295,7 +295,7 @@ def prepare_upcoming_version_branch(upcoming_params: UpcomingVersionBranchParams
     checkout_branch(upcoming_params.main_branch, upcoming_params.is_test)
     # create master-update-version-$curtime branch
     create_and_checkout_branch(upcoming_params.upcoming_version_branch)
-    # update version info with upcoming version on configure.in
+    # update version info with upcoming version on configure.ac
     update_version_in_configure_in(upcoming_params.project_name, upcoming_params.configure_in_path,
                                    upcoming_params.upcoming_devel_version)
     # update version info with upcoming version on config.py
@@ -351,7 +351,7 @@ def prepare_release_branch_for_major_release(majorReleaseParams: MajorReleasePar
     checkout_branch(majorReleaseParams.main_branch, majorReleaseParams.is_test)
     # create release branch in release-X.Y format
     create_and_checkout_branch(majorReleaseParams.release_branch_name)
-    # change version info in configure.in file
+    # change version info in configure.ac file
     update_version_in_configure_in(majorReleaseParams.project_name, majorReleaseParams.configure_in_path,
                                    majorReleaseParams.project_version)
     # execute "autoconf -f"