From 53ddfe2c9b636d29e4ebb94633bc0fe5fb4928a2 Mon Sep 17 00:00:00 2001
From: William Gearty <willgearty@gmail.com>
Date: Tue, 1 Aug 2023 21:27:35 -0400
Subject: [PATCH] Update GHA ubuntu image to include python 2.7 (#3669)

* Update ubuntu image to include python

* Fix tests.yml

* Remove setup-python

* Try something different

* Remove custom options

* make sure pip is high enough version

* add missing dependency

* add more dependencies explicitly

* specify dependency versions

* remove dependency before installing correct version

* try uninstalling but not specifying versions for installation

---------

Co-authored-by: Miles Calabresi <mcalabresi1@gmail.com>
---
 .github/workflows/tests.yml  | 3 +--
 deploy/travis/before_install | 1 +
 deploy/travis/install        | 1 +
 esp/packages_base.txt        | 3 +++
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 17f993558e..12d684a0f2 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -33,7 +33,7 @@ jobs:
     - uses: actions/checkout@v2
     - uses: niden/actions-memcached@v7
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@v2
+      uses: MatteoH2O1999/setup-python@v1
       with:
         python-version: ${{ matrix.python-version }}
     - name: Prepare for Installing Dependencies
@@ -56,4 +56,3 @@ jobs:
       with:
         fail_ci_if_error: true
         verbose: true
-    
diff --git a/deploy/travis/before_install b/deploy/travis/before_install
index 5e231ee5af..1a8179258b 100755
--- a/deploy/travis/before_install
+++ b/deploy/travis/before_install
@@ -16,3 +16,4 @@ if [ $(echo "$(lsb_release -rs) > 20" | bc) -eq 1 ]; then
 fi
 curl https://bootstrap.pypa.io/pip/2.7/get-pip.py --output get-pip.py
 sudo python2 get-pip.py
+sudo python2 -m pip install --upgrade pip==20.1
diff --git a/deploy/travis/install b/deploy/travis/install
index 3258ef596a..93a483ee61 100755
--- a/deploy/travis/install
+++ b/deploy/travis/install
@@ -2,6 +2,7 @@
 set -euf -o pipefail
 
 if [ "$TRAVIS_JOB" = "test" ]; then
+    sudo apt-get remove -y libhashkit2
     sudo apt-get install -y $(cat esp/packages_base.txt | grep -v ^memcached | grep -v ^postgres | grep -v ^libpq-dev | grep -v ^.*pip)
     esp/packages_base_manual_install.sh
     pip2 install -r esp/requirements.txt -q --log pip.log || (tail pip.log && exit 1)
diff --git a/esp/packages_base.txt b/esp/packages_base.txt
index 80544bbf8b..1e7e02033d 100644
--- a/esp/packages_base.txt
+++ b/esp/packages_base.txt
@@ -23,3 +23,6 @@ libc-ares2
 libev4
 git-core
 libfreetype6-dev
+libhashkit-dev
+libhashkit2
+libmemcached11