Skip to content

Commit

Permalink
ci: use tools-tree=default for mkosi in all builds
Browse files Browse the repository at this point in the history
Only s390x was using it so far.

Signed-off-by: Magnus Kulke <magnuskulke@microsoft.com>
  • Loading branch information
mkulke committed Jan 10, 2025
1 parent f178b7d commit dd0eb3f
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 20 deletions.
9 changes: 1 addition & 8 deletions .github/workflows/podvm_mkosi.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -114,14 +114,7 @@ jobs:
- name: Install build dependencies
run: |
sudo apt-get update -y
sudo apt-get install -y \
alien \
bubblewrap \
dnf \
mtools \
qemu-utils \
systemd-ukify \
uidmap
sudo apt-get install -y qemu-utils
sudo snap install yq
- name: Read properties from versions.yaml
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,6 @@
[Match]
Distribution=fedora

# mkosi version in nix is 17.1,
# which doesn't support Architecture in [Match]
# As a workaround, use a flag file instead.
#Architecture=s390x
PathExists=../../resources/buildS390xImage
Architecture=s390x

[Content]
Packages=kernel-core

[Host]
ToolsTree=default
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,6 @@ CleanPackageMetadata=true
RemoveFiles=/etc/pki/ca-trust/extracted/java/cacerts
/usr/lib/sysimage/libdnf5/transaction_history.sqlite*
/var/cache/ldconfig/aux-cache

[Host]
ToolsTree=default
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,3 @@ Packages=s390utils

[Output]
Format=directory

[Host]
ToolsTree=default
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,6 @@ RemoveFiles=/var/log
RemoveFiles=/var/cache
RemoveFiles=/etc/pki/ca-trust/extracted/java/cacerts
/usr/lib/sysimage/libdnf5/transaction_history.sqlite*

[Host]
ToolsTree=default

0 comments on commit dd0eb3f

Please sign in to comment.