Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[OSS-ONLY] Update version and upgrade-test-configuration #3152

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/composite-actions/install-dependencies/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion .github/composite-actions/setup-base-version/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/configuration/upgrade-test-configuration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ upgrade-version: [{
{
upgrade-path: [
{
version: '14.14',
version: '14.15',
upgrade-type: null
},
{
Expand Down
4 changes: 2 additions & 2 deletions .github/template/version-branch-template.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@
'14.13':
engine_branch: BABEL_2_10_STABLE__PG_14_13
extension_branch: BABEL_2_10_STABLE
'14.14':
engine_branch: BABEL_2_11_STABLE__PG_14_14
'14.15':
engine_branch: BABEL_2_11_STABLE__PG_14_15
extension_branch: BABEL_2_11_STABLE
'source.latest':
engine_branch: latest
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/isolation-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: |
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/python-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion contrib/babelfishpg_tsql/src/babelfish_version.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@
*/

#define BABELFISH_VERSION_STR "2.12.0"
#define BABELFISH_INTERNAL_VERSION_STR "Babelfish 14.15.0.0"
#define BABELFISH_INTERNAL_VERSION_STR "Babelfish 14.16.0.0"
#define BABEL_COMPATIBILITY_VERSION "12.0.2000.8"
#define BABEL_COMPATIBILITY_MAJOR_VERSION "12"
File renamed without changes.
Loading