[OSS-ONLY] Update default branch from 14_14 to 14_15 (#3143)

* Update default branch from BABEL_2_11_STABLE__PG_14_14 to BABEL_2_11_STABLE__PG_14_15. * Also update github actions to use fixed version of pymssql as newer version has dependency issue. Task: OSS-ONLY Signed-off-by: Rishabh Tanwar <[email protected]> Co-authored-by: RUI LUO <[email protected]>
babelfish-for-postgresql · Nov 22, 2024 · 2276b26 · 2276b26
1 parent 541c530
commit 2276b26
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/.github/composite-actions/install-dependencies/action.yml b/.github/composite-actions/install-dependencies/action.yml
@@ -8,5 +8,5 @@ runs:
         sudo apt clean && sudo apt-get update --fix-missing -y
         curl https://packages.microsoft.com/keys/microsoft.asc | sudo apt-key add -
         curl https://packages.microsoft.com/config/ubuntu/20.04/prod.list | sudo tee /etc/apt/sources.list.d/msprod.list
-        sudo apt-get install uuid-dev openjdk-8-jre libicu-dev libxml2-dev openssl libssl-dev python-dev libossp-uuid-dev libpq-dev cmake pkg-config g++ build-essential bison mssql-tools unixodbc-dev
+        sudo apt-get install uuid-dev openjdk-8-jre libicu-dev libxml2-dev openssl libssl-dev python-dev libossp-uuid-dev libpq-dev cmake pkg-config g++ build-essential bison mssql-tools unixodbc-dev libkrb5-dev
       shell: bash
diff --git a/.github/composite-actions/setup-base-version/action.yml b/.github/composite-actions/setup-base-version/action.yml
@@ -139,7 +139,7 @@ runs:
       run: |
         cd ~
         sudo apt-get install odbc-postgresql
-        pip3 install pyodbc==4.0.35 pymssql
+        pip3 install pyodbc==4.0.35 pymssql==2.2.7
       shell: bash
 
     - name: Run dependency check

diff --git a/.github/scripts/clone_engine_repo.conf b/.github/scripts/clone_engine_repo.conf
@@ -1 +1 @@
-DEFAULT_BRANCH=BABEL_2_11_STABLE__PG_14_14
+DEFAULT_BRANCH=BABEL_2_11_STABLE__PG_14_15
diff --git a/.github/workflows/isolation-tests.yml b/.github/workflows/isolation-tests.yml
@@ -49,7 +49,7 @@ jobs:
           curl https://packages.microsoft.com/config/ubuntu/20.04/prod.list | sudo tee /etc/apt/sources.list.d/mssql-release.list
           cd ~/work/babelfish_extensions/babelfish_extensions/test/python
           sudo ACCEPT_EULA=Y apt-get install -y msodbcsql17 python3-dev
-          pip3 install pyodbc pymssql pytest pytest-xdist antlr4-python3-runtime==4.9.3
+          pip3 install pyodbc pymssql==2.2.7 pytest pytest-xdist antlr4-python3-runtime==4.9.3
       
       - name: Generate .spec file parser
         run: |

diff --git a/.github/workflows/python-tests.yml b/.github/workflows/python-tests.yml
@@ -52,7 +52,7 @@ jobs:
           wget https://github.com/microsoft/sqltoolsservice/releases/download/4.4.0.12/Microsoft.SqlTools.ServiceLayer-rhel-x64-net6.0.tar.gz && tar -xzvf Microsoft.SqlTools.ServiceLayer-rhel-x64-net6.0.tar.gz
           cd ../
           sudo ACCEPT_EULA=Y apt-get install -y msodbcsql17 python3-dev
-          pip3 install pyodbc==4.0.35 pymssql pytest pytest-xdist
+          pip3 install pyodbc pymssql==2.2.7 pytest pytest-xdist
       
       - name: Run Python Tests
         if: always() && steps.configure-python-environment.outcome == 'success'

diff --git a/contrib/babelfishpg_tsql/src/babelfish_version.h b/contrib/babelfishpg_tsql/src/babelfish_version.h
@@ -9,6 +9,6 @@
  */
 
 #define BABELFISH_VERSION_STR "2.11.0"
-#define BABELFISH_INTERNAL_VERSION_STR "Babelfish 14.14.0.0"
+#define BABELFISH_INTERNAL_VERSION_STR "Babelfish 14.15.0.0"
 #define BABEL_COMPATIBILITY_VERSION "12.0.2000.8"
 #define BABEL_COMPATIBILITY_MAJOR_VERSION "12"
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		DEFAULT_BRANCH=BABEL_2_11_STABLE__PG_14_14
		DEFAULT_BRANCH=BABEL_2_11_STABLE__PG_14_15