Skip to content

Commit df187cd

Browse files
committed
Add Ubuntu 20.04 to GH Action build job
1 parent cae1681 commit df187cd

File tree

3 files changed

+16
-6
lines changed

3 files changed

+16
-6
lines changed

.github/actions/build-kernel/action.yml

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,20 @@ runs:
3636
libssl-dev \
3737
ncurses-dev \
3838
llvm \
39-
clang \
4039
clang-tools \
4140
lld \
4241
lz4 \
43-
pahole
42+
xz-utils
43+
44+
- name: Install pahole
45+
if: ${{ inputs.os == 'ubuntu-22.04' }}
46+
shell: bash
47+
run: sudo apt install pahole
48+
49+
- name: Install pahole
50+
if: ${{ inputs.os == 'ubuntu-20.04' }}
51+
shell: bash
52+
run: sudo apt install dwarves
4453

4554
- name: Install x86_64 dependencies
4655
if: ${{ inputs.arch == 'x86_64' }}

.github/workflows/build.yml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@ jobs:
66
strategy:
77
fail-fast: false
88
matrix:
9-
# TODO: Add 20.04
10-
os: [ubuntu-22.04]
9+
os: [ubuntu-22.04, ubuntu-20.04]
1110
kernel: [{ack: 0, version: 5.10.y}, {ack: 0, version: 5.15.y}, {ack: 0, version: 6.1.y}, {ack: 1, version: android13-5.10-lts}]
1211
arch: [arm64, x86_64]
1312
runs-on: ${{ matrix.os }}
@@ -70,7 +69,7 @@ jobs:
7069
id: cache-kernel
7170
uses: actions/cache@v3
7271
with:
73-
key: ${{ env.VERSION }}-${{ matrix.arch }}
72+
key: ${{ matrix.os }}-${{ env.VERSION }}-${{ matrix.arch }}
7473
path: |
7574
${{ steps.vars.outputs.KERNEL_IMAGE }}
7675
${{ steps.vars.outputs.OUT_DIR }}/vmlinux
@@ -96,12 +95,14 @@ jobs:
9695
echo "SUFFIX=$SUFFIX" >> $GITHUB_ENV
9796
9897
- name: Upload kernel image artifact
98+
if: ${{ matrix.os == 'ubuntu-22.04' }}
9999
uses: actions/upload-artifact@v3
100100
with:
101101
name: kernel-image
102102
path: ${{ steps.vars.outputs.KERNEL_IMAGE }}-${{ env.SUFFIX }}
103103

104104
- name: Upload vmlinux artifact
105+
if: ${{ matrix.os == 'ubuntu-22.04' }}
105106
uses: actions/upload-artifact@v3
106107
with:
107108
name: vmlinux

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ $(CLANG_DIR):
157157
tar -xf clang.tar.xz -C $(CLANG_DIR) --strip-components=1
158158

159159
.PHONY: linux_defconfig
160-
linux_defconfig $(LINUX_CONFIG): $(LINUX_CONFIG_FRAGMENT)
160+
linux_defconfig $(LINUX_CONFIG): $(LINUX_CONFIG_FRAGMENT) | $(CLANG_DIR)
161161
+ $(LINUX_MAKE) $(LINUX_DEFCONFIG)
162162
KCONFIG_CONFIG=$(LINUX_CONFIG) \
163163
$(LINUX_SRC)/scripts/kconfig/merge_config.sh \

0 commit comments

Comments
 (0)