From 19fc450d8388c1e0097563fd68cb675ca4444e97 Mon Sep 17 00:00:00 2001 From: Shard Gupta Date: Mon, 3 Mar 2025 04:57:28 +0000 Subject: [PATCH] Update mssql-tools repo Signed-off-by: Shard Gupta --- .../composite-actions/build-modified-postgres/action.yml | 8 ++++---- .../composite-actions/install-and-run-dotnet/action.yml | 8 ++++---- .../composite-actions/install-and-run-python/action.yml | 4 ++-- .github/composite-actions/install-dependencies/action.yml | 2 +- .github/composite-actions/setup-base-version/action.yml | 2 +- .github/workflows/isolation-tests.yml | 4 ++-- .github/workflows/sql-validation-tests.yml | 2 +- contrib/README.md | 2 +- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/composite-actions/build-modified-postgres/action.yml b/.github/composite-actions/build-modified-postgres/action.yml index f9299f30fc..f0e81e4a85 100644 --- a/.github/composite-actions/build-modified-postgres/action.yml +++ b/.github/composite-actions/build-modified-postgres/action.yml @@ -86,13 +86,13 @@ runs: cd .. cd postgresql_modified_for_babelfish if [[ ${{inputs.tap_tests}} == "yes" ]]; then - ./configure CC='ccache gcc' --prefix=$HOME/${{ inputs.install_dir }}/ --with-python PYTHON=/usr/bin/python3.8 --without-readline --enable-cassert CFLAGS="-ggdb" --with-libxml --with-uuid=ossp --with-icu --enable-tap-tests --with-gssapi + ./configure CC='ccache gcc' --prefix=$HOME/${{ inputs.install_dir }}/ --with-python PYTHON=/usr/bin/python3 --without-readline --enable-cassert CFLAGS="-ggdb" --with-libxml --with-uuid=ossp --with-icu --enable-tap-tests --with-gssapi elif [[ ${{inputs.code_coverage}} == "yes" ]]; then - ./configure CC='ccache gcc' --prefix=$HOME/${{ inputs.install_dir }}/ --with-python PYTHON=/usr/bin/python3.8 --without-readline --enable-coverage --enable-cassert CFLAGS="-ggdb" --with-libxml --with-uuid=ossp --with-icu + ./configure CC='ccache gcc' --prefix=$HOME/${{ inputs.install_dir }}/ --with-python PYTHON=/usr/bin/python3 --without-readline --enable-coverage --enable-cassert CFLAGS="-ggdb" --with-libxml --with-uuid=ossp --with-icu elif [[ ${{inputs.release_mode}} == "yes" ]]; then - ./configure CC='ccache gcc' --prefix=$HOME/${{ inputs.install_dir }}/ --with-python PYTHON=/usr/bin/python3.8 CFLAGS="-ggdb -O2" --without-readline --with-libxml --with-uuid=ossp --with-icu + ./configure CC='ccache gcc' --prefix=$HOME/${{ inputs.install_dir }}/ --with-python PYTHON=/usr/bin/python3 CFLAGS="-ggdb -O2" --without-readline --with-libxml --with-uuid=ossp --with-icu else - ./configure CC='ccache gcc' --prefix=$HOME/${{ inputs.install_dir }}/ --with-python PYTHON=/usr/bin/python3.8 --without-readline --enable-cassert CFLAGS="-ggdb" --with-libxml --with-uuid=ossp --with-icu + ./configure CC='ccache gcc' --prefix=$HOME/${{ inputs.install_dir }}/ --with-python PYTHON=/usr/bin/python3 --without-readline --enable-cassert CFLAGS="-ggdb" --with-libxml --with-uuid=ossp --with-icu fi make -j 4 make install diff --git a/.github/composite-actions/install-and-run-dotnet/action.yml b/.github/composite-actions/install-and-run-dotnet/action.yml index 426dc5b5d1..5449b7a9aa 100644 --- a/.github/composite-actions/install-and-run-dotnet/action.yml +++ b/.github/composite-actions/install-and-run-dotnet/action.yml @@ -7,10 +7,10 @@ runs: - name: Install MSSQL Tools id: install-mssql-tools run: | - curl https://packages.microsoft.com/keys/microsoft.asc | sudo apt-key add - - curl https://packages.microsoft.com/config/ubuntu/24.04/prod.list | sudo tee /etc/apt/sources.list.d/msprod.list + curl https://packages.microsoft.com/keys/microsoft.asc | sudo tee /etc/apt/trusted.gpg.d/microsoft.asc + curl https://packages.microsoft.com/config/ubuntu/22.04/prod.list | sudo tee /etc/apt/sources.list.d/mssql-release.list sudo apt-get update - sudo apt-get install mssql-tools unixodbc-dev + sudo apt-get install mssql-tools18 unixodbc-dev echo 'export PATH="$PATH:/opt/mssql-tools/bin"' >> ~/.bashrc source ~/.bashrc shell: bash @@ -20,7 +20,7 @@ runs: if: always() && steps.install-mssql-tools.outcome == 'success' run: | cd ~ - wget https://packages.microsoft.com/config/ubuntu/24.04/packages-microsoft-prod.deb -O packages-microsoft-prod.deb + wget https://packages.microsoft.com/config/ubuntu/22.04/packages-microsoft-prod.deb -O packages-microsoft-prod.deb sudo dpkg -i packages-microsoft-prod.deb rm packages-microsoft-prod.deb sudo apt-get install -y apt-transport-https diff --git a/.github/composite-actions/install-and-run-python/action.yml b/.github/composite-actions/install-and-run-python/action.yml index 5764a4c77a..aaf464fce6 100644 --- a/.github/composite-actions/install-and-run-python/action.yml +++ b/.github/composite-actions/install-and-run-python/action.yml @@ -8,14 +8,14 @@ runs: id: install-python uses: actions/setup-python@v2 with: - python-version: 3.11 + python-version: 3.10 - name: Configure Python Environment id: configure-python-environment if: always() && steps.install-python.outcome == 'success' run: | cd ~ - curl https://packages.microsoft.com/config/ubuntu/24.04/prod.list | sudo tee /etc/apt/sources.list.d/mssql-release.list + curl https://packages.microsoft.com/config/ubuntu/22.04/prod.list | sudo tee /etc/apt/sources.list.d/mssql-release.list cd ~/work/babelfish_extensions/babelfish_extensions/test/python mkdir sqltoolsservice cd sqltoolsservice diff --git a/.github/composite-actions/install-dependencies/action.yml b/.github/composite-actions/install-dependencies/action.yml index 58fe28055e..623b7f9ec3 100644 --- a/.github/composite-actions/install-dependencies/action.yml +++ b/.github/composite-actions/install-dependencies/action.yml @@ -6,7 +6,7 @@ runs: run: | 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/24.04/prod.list | sudo tee /etc/apt/sources.list.d/msprod.list + curl https://packages.microsoft.com/config/ubuntu/22.04/prod.list | sudo tee /etc/apt/sources.list.d/msprod.list sudo apt-get update --fix-missing -y sudo apt-get install uuid-dev openjdk-21-jre libicu-dev libxml2-dev openssl libssl-dev python3-dev libossp-uuid-dev libpq-dev cmake pkg-config g++ build-essential bison mssql-tools unixodbc-dev libsybdb5 freetds-dev freetds-common gdal-bin libgdal-dev libgeos-dev gdb libkrb5-dev sudo apt install -y ccache diff --git a/.github/composite-actions/setup-base-version/action.yml b/.github/composite-actions/setup-base-version/action.yml index 55ff1ccc93..975a5d1f1c 100644 --- a/.github/composite-actions/setup-base-version/action.yml +++ b/.github/composite-actions/setup-base-version/action.yml @@ -228,7 +228,7 @@ runs: if: ${{ matrix.upgrade-path.path[0] == 'source_latest' && steps.jdbc-upgrade-tests.outcome == 'success' }} uses: actions/setup-python@v2 with: - python-version: 3.11 + python-version: 3.10 - name: Configure Python Environment id: configure-python-environment diff --git a/.github/workflows/isolation-tests.yml b/.github/workflows/isolation-tests.yml index d1c0748000..a9f021a382 100644 --- a/.github/workflows/isolation-tests.yml +++ b/.github/workflows/isolation-tests.yml @@ -45,12 +45,12 @@ jobs: - name: Install Python uses: actions/setup-python@v2 with: - python-version: 3.11 + python-version: 3.10 - name: Configure Python environment run: | cd ~ - curl https://packages.microsoft.com/config/ubuntu/24.04/prod.list | sudo tee /etc/apt/sources.list.d/mssql-release.list + curl https://packages.microsoft.com/config/ubuntu/22.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.13.2 diff --git a/.github/workflows/sql-validation-tests.yml b/.github/workflows/sql-validation-tests.yml index 0ff05c64a0..ba69b9194d 100644 --- a/.github/workflows/sql-validation-tests.yml +++ b/.github/workflows/sql-validation-tests.yml @@ -11,7 +11,7 @@ jobs: id: install-python uses: actions/setup-python@v2 with: - python-version: 3.11 + python-version: 3.10 - name: Run tests id: run-test if: always() && steps.install-python.outcome == 'success' diff --git a/contrib/README.md b/contrib/README.md index 6edcc35d6a..b2852ad294 100644 --- a/contrib/README.md +++ b/contrib/README.md @@ -16,7 +16,7 @@ This package includes 5 extensions: # How do I build the extensions? -The following build instructions comply with Ubuntu 24.04 and Amazon Linux 2 environment. +The following build instructions comply with Ubuntu 22.04 and Amazon Linux 2 environment. ## Build the Postgres engine