Skip to content

Commit 5024945

Browse files
authored
Merge pull request #454 from Joshua-Dickens/master
Update ubuntu version in workflows
2 parents ea646d5 + cfc0258 commit 5024945

File tree

2 files changed

+11
-5
lines changed

2 files changed

+11
-5
lines changed

.github/workflows/checkpatch.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ permissions:
88

99
jobs:
1010
checkpatch:
11-
runs-on: ubuntu-20.04
11+
runs-on: ubuntu-24.04
1212
steps:
1313
- name: Checkout the repo
1414
uses: actions/checkout@v1

.github/workflows/main.yml

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ permissions:
55

66
env:
77
COMPILE_CFLAGS: -Werror
8-
PREPARE_CFLAGS:
8+
PREPARE_CFLAGS: -Wno-error=use-after-free
99

1010
jobs:
1111
compile:
12-
runs-on: ubuntu-20.04
12+
runs-on: ubuntu-24.04
1313
strategy:
1414
matrix:
1515
kernel: ["6.12", "6.10", "6.3", "5.15", "5.10", "5.4", "5.0", "4.19"]
@@ -37,7 +37,7 @@ jobs:
3737
- name: Install dependencies
3838
run: |
3939
sudo apt-get update
40-
sudo apt-get install gcc-9-plugin-dev libelf-dev
40+
sudo apt-get install gcc-13-plugin-dev libelf-dev
4141
gcc -print-file-name=plugin
4242
4343
- name: Checkout the repo
@@ -71,10 +71,16 @@ jobs:
7171
fi
7272
7373
# Fix issue preventing some late-version 4.x kenels from completing config
74-
if [[ "${KERNELVER}" == "4."* || "${KERNELVER}" == "5.1" ]]; then
74+
if [[ "${KERNELVER}" == "4."* || "${KERNELVER}" == "5.0" ]]; then
7575
curl "https://github.com/torvalds/linux/commit/dfbd199a7cfe3e3cd8531e1353cdbd7175bfbc5e.patch" | patch -t -N -r - -p1 -d "${KERNELROOT}" || true
7676
fi
7777
78+
# Fix issue preventing the 4.19 kenel and early 5.* kernels from completing config
79+
if [[ "${KERNELVER}" == "4."* || "${KERNELVER}" == "5.0" || "${KERNELVER}" == "5.4" ]]; then
80+
curl --output "fix.patch" "https://lore.kernel.org/lkml/20191208214607.20679-1-vt@altlinux.org/raw"
81+
patch -t -N -r - -p1 -d "${KERNELROOT}" < fix.patch
82+
fi
83+
7884
make -C ${KERNELROOT} defconfig
7985
${KERNELROOT}/scripts/config --file ${KERNELROOT}/.config --disable UNWINDER_ORC --enable UNWINDER_FRAME_POINTER
8086
make -C ${KERNELROOT} prepare modules_prepare EXTRA_CFLAGS="${PREPARE_CFLAGS} ${{ matrix.prepare_cflags }}"

0 commit comments

Comments
 (0)