From 1e7d937e1688f4ead301a4daaea649cb95cd9309 Mon Sep 17 00:00:00 2001 From: James McCoy Date: Tue, 17 Nov 2020 22:00:10 -0500 Subject: 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. --- .github/workflows/linux.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/linux.yml b/.github/workflows/linux.yml index d693f5e593..b8a8c01137 100644 --- a/.github/workflows/linux.yml +++ b/.github/workflows/linux.yml @@ -4,7 +4,7 @@ on: [push, pull_request] jobs: linux: name: ${{ matrix.flavor }} (cc=${{ matrix.cc }}) - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 strategy: matrix: include: @@ -26,12 +26,12 @@ jobs: if: matrix.flavor == 'asan' || matrix.flavor == 'tsan' run: | 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 run: | 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 if: matrix.flavor == 'asan' || matrix.flavor == 'tsan' -- cgit