From 7d7a3cdae8134fb33c944fe53494661cf18382c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kacper=20S=C5=82omi=C5=84ski?=
 <kacper.slominski72@gmail.com>
Date: Wed, 30 Oct 2024 13:37:03 +0100
Subject: [PATCH] github: Install y4 and switch to Ubuntu 24.04 for CI
 workflows

---
 .github/workflows/ci.yml   | 9 +++++++--
 .github/workflows/docs.yml | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 362afea9c..554cf21fe 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -48,14 +48,19 @@ jobs:
                         mlibc
                         mlibc-headers
         name: Build ${{ matrix.pkg }}
-        runs-on: ubuntu-20.04
+        runs-on: ubuntu-24.04
         steps:
+          - name: Permit unprivileged user namespaces
+            run: |
+                set -x
+                sudo sysctl -w kernel.apparmor_restrict_unprivileged_unconfined=0
+                sudo sysctl -w kernel.apparmor_restrict_unprivileged_userns=0
           - name: Install prerequisites
             run: |
                 set -x
                 sudo apt-get update
                 sudo apt-get install qemu-system-x86 pcre2-utils
-                pip3 install xbstrap
+                pip3 install xbstrap y4
                 xbstrap prereqs cbuildrt xbps
           - name: Check for requested bootstrap-managarm PR
             env:
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
index e987f2f64..6210e300e 100644
--- a/.github/workflows/docs.yml
+++ b/.github/workflows/docs.yml
@@ -5,7 +5,7 @@ on: [push, pull_request]
 jobs:
     build-docs:
         name: Build documentation
-        runs-on: ubuntu-20.04
+        runs-on: ubuntu-24.04
         steps:
           - name: Install prerequisites
             run: |