Skip to content

Commit 53c32cc

Browse files
authored
Remove duplicate installations from CI (#4017) (#4744)
There are duplicate installations in CI which causes problem. Signed-off-by: Bilal Kahraman <kahramannbilal@gmail.com>
1 parent 52d8d8b commit 53c32cc

2 files changed

Lines changed: 19 additions & 4 deletions

File tree

.github/composite-actions/install-dependencies/action.yml

Lines changed: 19 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,23 @@ runs:
55
- name: Install Dependencies
66
run: |
77
sudo apt clean && sudo apt-get update --fix-missing -y
8-
curl https://packages.microsoft.com/keys/microsoft.asc | sudo apt-key add -
9-
curl https://packages.microsoft.com/config/ubuntu/22.04/prod.list | sudo tee /etc/apt/sources.list.d/msprod.list
10-
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
8+
# Clean up any existing Microsoft repository configurations to avoid conflicts
9+
sudo rm -f /etc/apt/sources.list.d/msprod.list
10+
sudo rm -f /etc/apt/sources.list.d/packages-microsoft-com-prod.list
11+
sudo rm -f /etc/apt/trusted.gpg.d/microsoft.gpg
12+
sudo rm -f /usr/share/keyrings/microsoft-prod.gpg
13+
14+
# Download and install Microsoft's GPG key properly
15+
wget -qO- https://packages.microsoft.com/keys/microsoft.asc | sudo gpg --dearmor -o /usr/share/keyrings/microsoft-prod.gpg
16+
# Add Microsoft repository with proper GPG key configuration
17+
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
18+
sudo apt-get update --fix-missing -y
19+
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
20+
sudo apt install -y ccache
21+
sudo apt-get install lcov
22+
sudo /usr/sbin/update-ccache-symlinks
23+
# Install CMAKE 3.20.6
24+
wget -q https://github.com/Kitware/CMake/releases/download/v3.20.6/cmake-3.20.6-linux-x86_64.sh
25+
echo "y" | sudo bash ./cmake-3.20.6-linux-x86_64.sh --prefix=/usr/local
26+
echo "PATH=/usr/local/cmake-3.20.6-linux-x86_64/bin:/usr/lib/ccache:$PATH" >> $GITHUB_ENV
1127
shell: bash

.github/workflows/isolation-tests.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@ jobs:
4646
- name: Configure Python environment
4747
run: |
4848
cd ~
49-
curl https://packages.microsoft.com/config/ubuntu/22.04/prod.list | sudo tee /etc/apt/sources.list.d/mssql-release.list
5049
cd ~/work/babelfish_extensions/babelfish_extensions/test/python
5150
sudo ACCEPT_EULA=Y apt-get install -y msodbcsql17 python3-dev
5251
pip3 install pyodbc pymssql==2.2.7 pytest pytest-xdist antlr4-python3-runtime==4.9.3

0 commit comments

Comments
 (0)