From b86d59793855351487f9b49ca10a8f6351ad96db Mon Sep 17 00:00:00 2001 From: Andrew Kaster Date: Fri, 21 May 2021 04:04:55 -0600 Subject: [PATCH] CI: Add canonical-server/server-backports PPA to get updated QEMU Ubuntu 20.04 only ships QEMU 4.2.1, which is quite an older release. The BuildQemu.sh script uses version 6.0.0, while the server-backports PPA is currently shipping 5.2.1. If it turns out the server-backports PPA is not right, then we can switch to manually building and caching the source build. --- .github/workflows/cmake.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml index 259a973611..7915109119 100644 --- a/.github/workflows/cmake.yml +++ b/.github/workflows/cmake.yml @@ -35,10 +35,14 @@ jobs: - name: "Install Ubuntu dependencies" # These packages are already part of the ubuntu-20.04 image: # cmake gcc-10 g++-10 shellcheck libgmp-dev - # These aren't: + # Packages below aren't. + # + # We add the canonical-server/server-backports PPA to get updated QEMU releases without having to manage + # yet another cache in github actions run: | wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add - sudo add-apt-repository "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-11 main" + sudo add-apt-repository ppa:canonical-server/server-backports sudo apt-get update sudo apt-get install clang-format-11 libstdc++-10-dev libmpfr-dev libmpc-dev ninja-build npm e2fsprogs qemu-utils qemu-system-i386 ccache - name: Use GCC 10 instead @@ -52,7 +56,7 @@ jobs: python -m pip install --upgrade pip pip install flake8 requests - name: Check versions - run: set +e; g++ --version; g++-10 --version; clang-format --version; clang-format-11 --version; prettier --version; python --version; python3 --version; ninja --version; flake8 --version; ccache --version + run: set +e; g++ --version; g++-10 --version; clang-format --version; clang-format-11 --version; prettier --version; python --version; python3 --version; ninja --version; flake8 --version; ccache --version; qemu-system-i386 --version # === PREPARE FOR BUILDING ===