Skip to content

Commit

Permalink
Update GHA ubuntu image to include python 2.7 (#3669)
Browse files Browse the repository at this point in the history
* 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 <[email protected]>
  • Loading branch information
willgearty and milescalabresi authored Aug 2, 2023
1 parent 74bf15d commit 53ddfe2
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 2 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -56,4 +56,3 @@ jobs:
with:
fail_ci_if_error: true
verbose: true

1 change: 1 addition & 0 deletions deploy/travis/before_install
Original file line number Diff line number Diff line change
Expand Up @@ -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
1 change: 1 addition & 0 deletions deploy/travis/install
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
3 changes: 3 additions & 0 deletions esp/packages_base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -23,3 +23,6 @@ libc-ares2
libev4
git-core
libfreetype6-dev
libhashkit-dev
libhashkit2
libmemcached11

0 comments on commit 53ddfe2

Please sign in to comment.