Skip to content

Commit

Permalink
mkosi: Stop using tools tree
Browse files Browse the repository at this point in the history
Noble has all the tooling we need so let's stop using a tools tree
and just install the dependencies we need on the host system.
  • Loading branch information
DaanDeMeyer committed Jun 8, 2024
1 parent 27cd8a6 commit 60f1e44
Showing 1 changed file with 10 additions and 16 deletions.
26 changes: 10 additions & 16 deletions .github/workflows/mkosi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -140,8 +140,6 @@ jobs:
LLVM=${{ matrix.llvm }}
[Host]
ToolsTree=default
ToolsTreeDistribution=fedora
QemuMem=4G
# We build with debuginfo so there's no point in mounting the sources into the machine.
RuntimeBuildSources=no
Expand All @@ -153,24 +151,20 @@ jobs:
- name: Show image summary
run: mkosi summary

- name: Install build dependencies
- name: Install dependencies
run: |
sudo apt-get install \
meson \
mkosi dependencies |
xargs -d '\n' sudo apt-get install \
gperf \
libfdisk-dev \
libmount-dev \
libtss2-dev \
libblkid-dev \
libmicrohttpd-dev \
libcap-dev \
libcurl4-openssl-dev \
libcryptsetup-dev \
erofs-utils \
dosfstools \
python3-pefile \
sbsigntool \
mtools
libcurl4-openssl-dev \
libfdisk-dev \
libmicrohttpd-dev \
libmount-dev \
libtss2-dev \
meson
- name: Configure meson
run: |
Expand All @@ -183,7 +177,7 @@ jobs:
-Dtpm2=enabled \
-Dlibcryptsetup=enabled \
-Dlibcurl=enabled \
-Drepart=disabled \
-Drepart=enabled \
-Dfirstboot=true \
-Dsysusers=true \
-Dtmpfiles=true \
Expand Down

0 comments on commit 60f1e44

Please sign in to comment.