From 1bf04d097233d34f4196b9707ad93d2c62f397dc Mon Sep 17 00:00:00 2001
From: David Vernet <void@manifault.com>
Date: Tue, 19 Dec 2023 15:25:50 -0600
Subject: [PATCH] ci: Run CI job on Ubuntu 22.04

Andrea pointed out that we can and should be using Ubuntu 22.04.
Unfortunately it still doesn't ship some of the deps we need like
clang-17, but it does at least ship virtme-ng, so it's good for us to
use this so that we can actually test running the schedulers in a
virtme-ng VM when it supports being run in docker.

Also, update the job to run on pushes, and not just when a PR is opened

Suggested-by: Andrea Righi <andrea.righi@canonical.com>
Signed-off-by: David Vernet <void@manifault.com>
---
 .github/workflows/build-scheds.yml | 32 ++++++++++++++++++++----------
 1 file changed, 21 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/build-scheds.yml b/.github/workflows/build-scheds.yml
index 5cdaba7fb..4ddc35377 100644
--- a/.github/workflows/build-scheds.yml
+++ b/.github/workflows/build-scheds.yml
@@ -1,19 +1,31 @@
 name: build-scheds
 run-name: ${{ github.actor }} PR run
-on: [pull_request]
+on: [pull_request, push]
 jobs:
   build-schedulers:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
+      ### OTHER REPOS ####
+
+      # virtme-ng isn't used yet, but let's incorporate installing it in our environment
+      # as we have plans to use it in the future.
+      - run: sudo add-apt-repository -y ppa:arighi/virtme-ng
+      - run: sudo apt update
+
+      # Hard turn-off interactive mode
+      - run: echo 'debconf debconf/frontend select Noninteractive' | sudo debconf-set-selections
 
       ### DOWNLOAD AND INSTALL DEPENDENCIES ###
 
       # Download dependencies packaged by Ubuntu
-      - run: sudo apt update
-      - run: sudo apt -y install cmake cargo elfutils libelf-dev linux-headers-generic linux-tools-common ninja-build
+      - run: sudo apt -y install cmake cargo elfutils libelf-dev libunwind-dev libzstd-dev linux-headers-generic linux-tools-common linux-tools-generic ninja-build virtme-ng
 
       # clang 17
-      - run: wget https://apt.llvm.org/llvm.sh
+      # Use a custom llvm.sh script which includes the -y flag for
+      # add-apt-repository. Otherwise, the CI job will hang. If and when
+      # https://github.com/opencollab/llvm-jenkins.debian.net/pull/26 is
+      # merged, we can go back to using https://apt.llvm.org/llvm.sh.
+      - run: wget https://raw.githubusercontent.com/Decave/llvm-jenkins.debian.net/fix_llvmsh/llvm.sh
       - run: chmod +x llvm.sh
       - run: sudo ./llvm.sh all
       - run: sudo ln -sf /usr/bin/clang-17 /usr/bin/clang
@@ -24,11 +36,6 @@ jobs:
       - run: make -j -C bpftool/src
       - run: sudo make -j -C bpftool/src install
 
-      # zstd
-      - run: git clone --branch zstd-0.4.2 https://github.com/facebook/zstd.git
-      - run: make -j -C zstd
-      - run: sudo make -j -C zstd install
-
       # asm headers
       - run: sudo ln -s /usr/include/asm-generic /usr/include/asm
 
@@ -45,5 +52,8 @@ jobs:
       ### END DEPENDENCIES ###
 
       # The actual build:
-      - run: meson setup build -Dlibbpf_a=`pwd`/libbpf/src/libbpf.a --prefix ~
+      - run: meson setup build -Dlibbpf_a=`pwd`/libbpf/src/libbpf.a
       - run: meson compile -C build
+
+      # TODO: Run the schedulers using virtme-ng (currently blocked on being able
+      #       to use virtme-ng in a Docker container).