89 lines
2.4 KiB
Diff
89 lines
2.4 KiB
Diff
From 9db018d9baf17460b9105915b2b92bee63f48912 Mon Sep 17 00:00:00 2001
|
|
From: Daan De Meyer <daan.j.demeyer@gmail.com>
|
|
Date: Mon, 6 Jan 2025 12:08:33 +0100
|
|
Subject: [PATCH] ci: Rename qemu variable to vm
|
|
|
|
(cherry picked from commit c5981510e9744b9646088717aeef1ea71f74b1a6)
|
|
---
|
|
.github/workflows/mkosi.yml | 18 +++++++++---------
|
|
1 file changed, 9 insertions(+), 9 deletions(-)
|
|
|
|
diff --git a/.github/workflows/mkosi.yml b/.github/workflows/mkosi.yml
|
|
index d4b37f72b0..a043022ce0 100644
|
|
--- a/.github/workflows/mkosi.yml
|
|
+++ b/.github/workflows/mkosi.yml
|
|
@@ -60,56 +60,56 @@ jobs:
|
|
llvm: 0
|
|
cflags: "-O2 -D_FORTIFY_SOURCE=3"
|
|
relabel: no
|
|
- qemu: 1
|
|
+ vm: 1
|
|
- distro: debian
|
|
release: testing
|
|
sanitizers: ""
|
|
llvm: 0
|
|
cflags: "-Og"
|
|
relabel: no
|
|
- qemu: 0
|
|
+ vm: 0
|
|
- distro: ubuntu
|
|
release: noble
|
|
sanitizers: ""
|
|
llvm: 0
|
|
cflags: "-Og"
|
|
relabel: no
|
|
- qemu: 0
|
|
+ vm: 0
|
|
- distro: fedora
|
|
release: "41"
|
|
sanitizers: ""
|
|
llvm: 0
|
|
cflags: "-Og"
|
|
relabel: yes
|
|
- qemu: 0
|
|
+ vm: 0
|
|
- distro: fedora
|
|
release: rawhide
|
|
sanitizers: address,undefined
|
|
llvm: 1
|
|
cflags: "-Og"
|
|
relabel: yes
|
|
- qemu: 0
|
|
+ vm: 0
|
|
- distro: opensuse
|
|
release: tumbleweed
|
|
sanitizers: ""
|
|
llvm: 0
|
|
cflags: "-Og"
|
|
relabel: no
|
|
- qemu: 0
|
|
+ vm: 0
|
|
- distro: centos
|
|
release: "9"
|
|
sanitizers: ""
|
|
llvm: 0
|
|
cflags: "-Og"
|
|
relabel: yes
|
|
- qemu: 0
|
|
+ vm: 0
|
|
- distro: centos
|
|
release: "10"
|
|
sanitizers: ""
|
|
llvm: 0
|
|
cflags: "-Og"
|
|
relabel: yes
|
|
- qemu: 0
|
|
+ vm: 0
|
|
|
|
steps:
|
|
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
|
|
@@ -194,7 +194,7 @@ jobs:
|
|
sudo --preserve-env \
|
|
mkosi sandbox \
|
|
env \
|
|
- TEST_PREFER_QEMU=${{ matrix.qemu }} \
|
|
+ TEST_PREFER_QEMU=${{ matrix.vm }} \
|
|
meson test \
|
|
-C build \
|
|
--no-rebuild \
|