GHA: Switch to ubuntu-20.04 image for Linux

Stop explicitly installing Ubuntu's python package, since most of the
Python 2 packages (and importantly pip/setuptools) have been removed in
this Ubuntu version.
This commit is contained in:
James McCoy
2020-11-17 22:00:10 -05:00
parent 029b5d036d
commit 1e7d937e16

View File

@@ -4,7 +4,7 @@ on: [push, pull_request]
jobs: jobs:
linux: linux:
name: ${{ matrix.flavor }} (cc=${{ matrix.cc }}) name: ${{ matrix.flavor }} (cc=${{ matrix.cc }})
runs-on: ubuntu-latest runs-on: ubuntu-20.04
strategy: strategy:
matrix: matrix:
include: include:
@@ -26,12 +26,12 @@ jobs:
if: matrix.flavor == 'asan' || matrix.flavor == 'tsan' if: matrix.flavor == 'asan' || matrix.flavor == 'tsan'
run: | run: |
wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key|sudo apt-key add - wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key|sudo apt-key add -
sudo add-apt-repository 'deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-11 main' sudo add-apt-repository 'deb http://apt.llvm.org/focal/ llvm-toolchain-focal-11 main'
- name: Install apt packages - name: Install apt packages
run: | run: |
sudo apt-get update sudo apt-get update
sudo apt-get install -y autoconf automake build-essential ccache cmake cpanminus cscope gcc-multilib gdb gettext gperf language-pack-tr libtool-bin locales ninja-build pkg-config python python-pip python-setuptools python3 python3-pip python3-setuptools unzip valgrind xclip sudo apt-get install -y autoconf automake build-essential ccache cmake cpanminus cscope gcc-multilib gdb gettext gperf language-pack-tr libtool-bin locales ninja-build pkg-config python3 python3-pip python3-setuptools unzip valgrind xclip
- name: Install new clang - name: Install new clang
if: matrix.flavor == 'asan' || matrix.flavor == 'tsan' if: matrix.flavor == 'asan' || matrix.flavor == 'tsan'