Merge remote-tracking branch 'upstream/BABEL_5_1_STABLE' into cherry-…

…pick-5x-1
amazon-aurora · Feb 7, 2025 · fd83fc8 · fd83fc8
2 parents 2fa2bd0 + 65f5d88
commit fd83fc8
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/.github/template/version-branch-template.yml b/.github/template/version-branch-template.yml
@@ -50,8 +50,8 @@
   engine_branch: BABEL_2_11_STABLE__PG_14_15
   extension_branch: BABEL_2_11_STABLE
 '14.16':
-  engine_branch: BABEL_2_X_DEV__PG_14_X
-  extension_branch: BABEL_2_X_DEV
+  engine_branch: BABEL_2_12_STABLE__PG_14_16
+  extension_branch: BABEL_2_12_STABLE
 '15.2':
   engine_branch: BABEL_3_1_STABLE__PG_15_2
   extension_branch: BABEL_3_1_STABLE
@@ -77,8 +77,8 @@
   engine_branch: BABEL_3_8_STABLE__PG_15_10
   extension_branch: BABEL_3_8_STABLE
 '15.11':
-  engine_branch: BABEL_3_X_DEV__PG_15_X
-  extension_branch: BABEL_3_X_DEV
+  engine_branch: BABEL_3_9_STABLE__PG_15_11
+  extension_branch: BABEL_3_9_STABLE
 '16.1':
   engine_branch: BABEL_4_0_STABLE__PG_16_1
   extension_branch: BABEL_4_0_STABLE
@@ -95,8 +95,8 @@
   engine_branch: BABEL_4_4_STABLE__PG_16_6
   extension_branch: BABEL_4_4_STABLE
 '16.7':
-  engine_branch: BABEL_4_X_DEV__PG_16_X
-  extension_branch: BABEL_4_X_DEV
+  engine_branch: BABEL_4_5_STABLE__PG_16_7
+  extension_branch: BABEL_4_5_STABLE
 '17.2':
   engine_branch: BABEL_5_0_STABLE__PG_17_2
   extension_branch: BABEL_5_0_STABLE

diff --git a/.github/workflows/major-version-upgrade.yml b/.github/workflows/major-version-upgrade.yml
@@ -6,8 +6,8 @@ jobs:
     env:
       OLD_INSTALL_DIR: psql_source
       NEW_INSTALL_DIR: psql_target
-      ENGINE_BRANCH_FROM: BABEL_2_X_DEV__PG_14_X
-      EXTENSION_BRANCH_FROM: BABEL_2_X_DEV
+      ENGINE_BRANCH_FROM: BABEL_2_12_STABLE__PG_14_16
+      EXTENSION_BRANCH_FROM: BABEL_2_12_STABLE
 
     runs-on: ubuntu-20.04
     steps:

diff --git a/.github/workflows/singledb-version-upgrade.yml b/.github/workflows/singledb-version-upgrade.yml
@@ -7,7 +7,7 @@ jobs:
       env:
       OLD_INSTALL_DIR: psql_source
       NEW_INSTALL_DIR: psql_target
-      ENGINE_BRANCH_FROM: BABEL_4_5_STABLE__PG_16_6
+      ENGINE_BRANCH_FROM: BABEL_4_5_STABLE__PG_16_7
       EXTENSION_BRANCH_FROM: BABEL_4_5_STABLE
 
     runs-on: ubuntu-20.04
@@ -23,7 +23,7 @@ jobs:
           extension_branch: ${{ env.EXTENSION_BRANCH_FROM }}
           install_dir: ${{ env.OLD_INSTALL_DIR }}
           migration_mode: 'single-db'
-          antlr_version: 4.9.3
+          antlr_version: 4.13.2
 
       - name: Check Babelfish metadata inconsistency before Major Version Upgrade
         id: check-babelfish-inconsistency