From 81c0b36ec62f7d03e8931343ce9b754317fecbca Mon Sep 17 00:00:00 2001 From: Bilal Kahraman <45990633+bilalkah@users.noreply.github.com> Date: Thu, 14 Aug 2025 12:56:28 +0300 Subject: [PATCH] Remove duplicate installations from CI (#4017) There are duplicate installations in CI which causes problem. Signed-off-by: Bilal Kahraman --- .../install-dependencies/action.yml | 22 ++++++++++++++++--- .github/workflows/isolation-tests.yml | 1 - 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/.github/composite-actions/install-dependencies/action.yml b/.github/composite-actions/install-dependencies/action.yml index 2f6f2751ab9..9526825176b 100644 --- a/.github/composite-actions/install-dependencies/action.yml +++ b/.github/composite-actions/install-dependencies/action.yml @@ -5,7 +5,23 @@ runs: - name: Install Dependencies 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/22.04/prod.list | sudo tee /etc/apt/sources.list.d/msprod.list - sudo apt-get install gcc-9 uuid-dev openjdk-8-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 libkrb5-dev + # Clean up any existing Microsoft repository configurations to avoid conflicts + sudo rm -f /etc/apt/sources.list.d/msprod.list + sudo rm -f /etc/apt/sources.list.d/packages-microsoft-com-prod.list + sudo rm -f /etc/apt/trusted.gpg.d/microsoft.gpg + sudo rm -f /usr/share/keyrings/microsoft-prod.gpg + + # Download and install Microsoft's GPG key properly + wget -qO- https://packages.microsoft.com/keys/microsoft.asc | sudo gpg --dearmor -o /usr/share/keyrings/microsoft-prod.gpg + # Add Microsoft repository with proper GPG key configuration + echo "deb [arch=amd64,arm64,armhf signed-by=/usr/share/keyrings/microsoft-prod.gpg] https://packages.microsoft.com/ubuntu/22.04/prod jammy main" | sudo tee /etc/apt/sources.list.d/msprod.list + sudo apt-get update --fix-missing -y + sudo apt-get install gcc-9 uuid-dev openjdk-21-jre libicu-dev libxml2-dev openssl libssl-dev python3-dev libossp-uuid-dev libpq-dev 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 + sudo apt-get install lcov + sudo /usr/sbin/update-ccache-symlinks + # Install CMAKE 3.20.6 + wget -q https://github.com/Kitware/CMake/releases/download/v3.20.6/cmake-3.20.6-linux-x86_64.sh + echo "y" | sudo bash ./cmake-3.20.6-linux-x86_64.sh --prefix=/usr/local + echo "PATH=/usr/local/cmake-3.20.6-linux-x86_64/bin:/usr/lib/ccache:$PATH" >> $GITHUB_ENV shell: bash diff --git a/.github/workflows/isolation-tests.yml b/.github/workflows/isolation-tests.yml index b5c87646f1d..91ea3934a23 100644 --- a/.github/workflows/isolation-tests.yml +++ b/.github/workflows/isolation-tests.yml @@ -46,7 +46,6 @@ jobs: - name: Configure Python environment run: | cd ~ - 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==2.2.7 pytest pytest-xdist antlr4-python3-runtime==4.9.3