summaryrefslogtreecommitdiffstats
path: root/.github/workflows
diff options
context:
space:
mode:
Diffstat (limited to '.github/workflows')
-rw-r--r--.github/workflows/build_test.yml2
-rw-r--r--.github/workflows/mkosi.yml7
2 files changed, 7 insertions, 2 deletions
diff --git a/.github/workflows/build_test.yml b/.github/workflows/build_test.yml
index ce298e5efe..9284bec988 100644
--- a/.github/workflows/build_test.yml
+++ b/.github/workflows/build_test.yml
@@ -26,7 +26,7 @@ jobs:
matrix:
env:
- { COMPILER: "gcc", COMPILER_VERSION: "11", LINKER: "bfd", CRYPTOLIB: "gcrypt" }
- - { COMPILER: "gcc", COMPILER_VERSION: "12", LINKER: "gold", CRYPTOLIB: "openssl" }
+ - { COMPILER: "gcc", COMPILER_VERSION: "13", LINKER: "gold", CRYPTOLIB: "openssl" }
- { COMPILER: "clang", COMPILER_VERSION: "14", LINKER: "mold", CRYPTOLIB: "gcrypt" }
- { COMPILER: "clang", COMPILER_VERSION: "15", LINKER: "lld", CRYPTOLIB: "openssl" }
- { COMPILER: "clang", COMPILER_VERSION: "16", LINKER: "bfd", CRYPTOLIB: "auto" }
diff --git a/.github/workflows/mkosi.yml b/.github/workflows/mkosi.yml
index c125d59ad3..886f0bc91d 100644
--- a/.github/workflows/mkosi.yml
+++ b/.github/workflows/mkosi.yml
@@ -76,7 +76,7 @@ jobs:
steps:
- uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
- - uses: systemd/mkosi@e3141cd82206e00e3a6b02c09e08b3d443462063
+ - uses: systemd/mkosi@c3103868cccc722ef45838fdd37fb462c21948f2
- name: Configure
run: |
@@ -98,6 +98,7 @@ jobs:
[Host]
ExtraSearchPaths=!*
+ QemuVsock=yes
EOF
# For erofs, we have to install linux-modules-extra-azure, but that doesn't match the running kernel
@@ -123,3 +124,7 @@ jobs:
- name: Boot ${{ matrix.distro }} QEMU
run: timeout -k 30 10m mkosi --debug qemu
+
+ # vsock in Github Actions with qemu is broken so for now we check for failures manually.
+ - name: Check ${{ matrix.distro }} QEMU
+ run: sudo mkosi shell bash -c "[[ -e /testok ]] || { cat /failed-services; exit 1; }"