summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Rettberg2024-03-15 15:29:47 +0100
committerSimon Rettberg2024-03-15 15:29:47 +0100
commit4d208d3e1325fcc90b01b2d8cb3a24577b1574a9 (patch)
tree3062ccba18aff84e2a9cacab7284b9e2f46730b0
parentgithub: Update to checkout@v4 (diff)
downloadxloop-4d208d3e1325fcc90b01b2d8cb3a24577b1574a9.tar.gz
xloop-4d208d3e1325fcc90b01b2d8cb3a24577b1574a9.tar.xz
xloop-4d208d3e1325fcc90b01b2d8cb3a24577b1574a9.zip
github: Try building everything on ubuntu-22.04
-rw-r--r--.github/workflows/build-kernel-modules.yml14
-rw-r--r--.github/workflows/build-program.yml7
2 files changed, 10 insertions, 11 deletions
diff --git a/.github/workflows/build-kernel-modules.yml b/.github/workflows/build-kernel-modules.yml
index cc85760..1c6dce8 100644
--- a/.github/workflows/build-kernel-modules.yml
+++ b/.github/workflows/build-kernel-modules.yml
@@ -14,15 +14,15 @@ jobs:
matrix:
config:
- name: kernel modules [Linux kernel 5.4.x]
- build-os: ubuntu-20.04
+ build-os: ubuntu-22.04
kernel-type: vanilla
kernel-version: 5.4.y
- name: kernel modules [Linux kernel 5.10.x]
- build-os: ubuntu-20.04
+ build-os: ubuntu-22.04
kernel-type: vanilla
kernel-version: 5.10.y
- name: kernel modules [Linux kernel 5.15.x]
- build-os: ubuntu-20.04
+ build-os: ubuntu-22.04
kernel-type: vanilla
kernel-version: 5.15.y
- name: kernel modules [Linux kernel 6.1.x]
@@ -34,19 +34,19 @@ jobs:
kernel-type: vanilla
kernel-version: 6.6.y
- name: kernel modules [CentOS 8.4 kernel 4.18.0-305]
- build-os: ubuntu-20.04
+ build-os: ubuntu-22.04
kernel-type: centos-rpm
kernel-source: https://vault.centos.org/8.4.2105/BaseOS/Source/SPackages/kernel-4.18.0-305.10.2.el8_4.src.rpm
- name: kernel modules [CentOS 8.5 kernel 4.18.0-348]
- build-os: ubuntu-20.04
+ build-os: ubuntu-22.04
kernel-type: centos-rpm
kernel-source: https://vault.centos.org/8.5.2111/BaseOS/Source/SPackages/kernel-4.18.0-348.7.1.el8_5.src.rpm
- name: kernel modules [CentOS 9.3 kernel 5.14.0-x]
- build-os: ubuntu-20.04
+ build-os: ubuntu-22.04
kernel-type: centos-tar
kernel-source: https://files.bwlp.ks.uni-freiburg.de/stuff/centos/linux-5.14.0-362.18.1.el9_3.tar.xz
- name: kernel modules [CentOS 9.4 kernel 5.14.0-x]
- build-os: ubuntu-20.04
+ build-os: ubuntu-22.04
kernel-type: centos-tar
kernel-source: https://files.bwlp.ks.uni-freiburg.de/stuff/centos/linux-5.14.0-427.el9.tar.xz
name: Build xloop ${{ matrix.config.name }}
diff --git a/.github/workflows/build-program.yml b/.github/workflows/build-program.yml
index 8a8d177..d1a942f 100644
--- a/.github/workflows/build-program.yml
+++ b/.github/workflows/build-program.yml
@@ -14,10 +14,10 @@ jobs:
matrix:
config:
- name: debug [default] on Ubuntu 20.04
- build-os: ubuntu-20.04
+ build-os: ubuntu-22.04
build-type: "Debug"
- name: release [default] on Ubuntu 20.04
- build-os: ubuntu-20.04
+ build-os: ubuntu-22.04
build-type: "Release"
name: Build xloop ${{ matrix.config.name }}
runs-on: ${{ matrix.config.build-os }}
@@ -28,8 +28,7 @@ jobs:
sudo apt-get install -y -qq make \
clang-format \
linux-headers-generic \
- libcap-dev \
- rpm
+ libcap-dev
- name: Checkout xloop repository
uses: actions/checkout@v4
- name: Fetch xloop repository tags