From 4ab66e04f8bd5a675788a1ff7e452bc71d183233 Mon Sep 17 00:00:00 2001
From: Tamir Duberstein <tamird@gmail.com>
Date: Tue, 8 Aug 2023 13:57:52 -0400
Subject: [PATCH] github: bump to ubuntu 22.04

This should get the aya integration tests passing, which are not yet
able to run on older kernels. See https://github.com/aya-rs/aya/pull/725
and https://github.com/aya-rs/aya/pull/638.
---
 .github/workflows/ci.yml      | 17 +++++++++++------
 .github/workflows/llvm.yml    |  2 +-
 .github/workflows/release.yml |  2 +-
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 17270ec6..ddbe91bf 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -20,7 +20,7 @@ jobs:
     uses: ./.github/workflows/llvm.yml
 
   lint-stable:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     steps:
       - uses: actions/checkout@v3
@@ -34,7 +34,7 @@ jobs:
         run: cargo clippy --features llvm-sys/no-llvm-linking --all-targets --workspace -- --deny warnings
 
   lint-nightly:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
 
     steps:
       - uses: actions/checkout@v3
@@ -48,7 +48,7 @@ jobs:
         run: cargo fmt --all -- --check
 
   build:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     strategy:
       fail-fast: false
       matrix:
@@ -91,11 +91,16 @@ jobs:
 
       - name: Install dependencies
         if: matrix.rust == 'nightly'
-        # ubuntu-20.04 comes with clang prior to
-        # https://github.com/llvm/llvm-project/commit/6d6750696400 which does not implement
-        # __builtin_preserve_enum_value, used by relocation tests in aya.
+        # ubuntu-22.04 comes with clang 14[0] which doesn't include support for signed and 64bit
+        # enum values which was added in clang 15[1].
         #
         # gcc-multilib provides at least <asm/types.h> which is referenced by libbpf.
+        #
+        # llvm provides llvm-objcopy which is used to build the BTF relocation tests.
+        #
+        # [0] https://github.com/actions/runner-images/blob/ubuntu22/20230724.1/images/linux/Ubuntu2204-Readme.md
+        #
+        # [1] https://github.com/llvm/llvm-project/commit/dc1c43d
         run: |
           set -euxo pipefail
           wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
diff --git a/.github/workflows/llvm.yml b/.github/workflows/llvm.yml
index 928c17fc..610dafd2 100644
--- a/.github/workflows/llvm.yml
+++ b/.github/workflows/llvm.yml
@@ -8,7 +8,7 @@ on:
 
 jobs:
   llvm:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     name: llvm
     outputs:
       cache-key: ${{ steps.cache-key.outputs.cache-key }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index f0eb0d51..43b3a866 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -10,7 +10,7 @@ jobs:
 
   upload-bins:
     # TODO: Build for macos someday.
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     needs: llvm
     steps:
       - name: Restore LLVM