diff --git a/.github/workflows/create_containers.yml b/.github/workflows/create_containers.yml index 8fe181b5d..41f78e760 100644 --- a/.github/workflows/create_containers.yml +++ b/.github/workflows/create_containers.yml @@ -9,7 +9,7 @@ jobs: strategy: fail-fast: false matrix: - os: [fedora, debian-x86_64, arch, debian-i386] + os: [fedora, debian-x86_64, arch, debian-i386, void] steps: - name: Check out the repo diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 2288a0124..c2fdbe3a9 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -39,7 +39,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - os: [fedora, debian-x86_64, arch, debian-i386] + os: [fedora, debian-x86_64, arch, debian-i386, void] steps: - uses: actions/checkout@v2 - name: Docker login diff --git a/contrib/ci/Dockerfile-void.in b/contrib/ci/Dockerfile-void.in new file mode 100644 index 000000000..069f21560 --- /dev/null +++ b/contrib/ci/Dockerfile-void.in @@ -0,0 +1,10 @@ +FROM ghcr.io/void-linux/void-linux:latest-full-x86_64-musl +%%%OS%%% +ENV LANG en_US.UTF-8 +ENV LC_ALL en_US.UTF-8 +ENV CI_NETWORK true +RUN echo fubar > /etc/machine-id +RUN xbps-install -Suy xbps && xbps-install -uy +%%%INSTALL_DEPENDENCIES_COMMAND%%% +WORKDIR /github/workspace +CMD ["./contrib/ci/void.sh"] diff --git a/contrib/ci/dependencies.xml b/contrib/ci/dependencies.xml index f826f468b..dd15781d4 100644 --- a/contrib/ci/dependencies.xml +++ b/contrib/ci/dependencies.xml @@ -10,6 +10,11 @@ + + + + + @@ -87,6 +92,11 @@ + + + + + @@ -99,6 +109,9 @@ cairo-devel + + cairo-devel + @@ -138,6 +151,9 @@ json-glib-devel + + json-glib-devel + (>= 1.1.1) @@ -199,6 +215,9 @@ google-noto-sans-cjk-ttc-fonts + + noto-fonts-cjk + @@ -359,6 +378,9 @@ + + + @@ -377,6 +399,9 @@ + + + (>= 0.19.8.1) @@ -410,6 +435,9 @@ + + gnu-efi-libs + amd64 @@ -441,6 +469,9 @@ + + + @@ -466,6 +497,9 @@ glib2-devel + + glib-devel + (>= 2.45.8) @@ -496,6 +530,9 @@ gobject-introspection-devel + + + @@ -525,6 +562,9 @@ gnutls-devel + + gnutls-devel + @@ -543,6 +583,9 @@ gnutls-utils + + gnutls-tools + @@ -595,6 +638,9 @@ libxmlb-devel + + libxmlb-devel + (>= 0.1.13) @@ -624,6 +670,9 @@ + + libjcat-devel + @@ -642,6 +691,9 @@ + + libarchive-devel + @@ -653,6 +705,9 @@ efivar-devel + + libefivar-devel + amd64 @@ -714,6 +769,9 @@ + + gcab-devel + @@ -755,6 +813,9 @@ libgusb-devel + + libgusb-devel + (>= 0.3.5) @@ -792,6 +853,9 @@ libsmbios-devel + + libsmbios-devel + i386 @@ -813,6 +877,9 @@ + + libsoup-devel + @@ -824,6 +891,9 @@ libcurl-devel + + libcurl-devel + @@ -906,6 +976,9 @@ + + + @@ -938,6 +1011,9 @@ pango-devel + + pango-devel + @@ -958,6 +1034,9 @@ + + + @@ -969,6 +1048,9 @@ polkit + + polkit + (>> 0.105-14) @@ -1054,6 +1136,9 @@ polkit-devel + + polkit-devel + @@ -1077,6 +1162,9 @@ + + + @@ -1157,6 +1245,9 @@ + + + @@ -1210,6 +1301,14 @@ + + sqlite-devel + + + + + elogind-devel + @@ -1323,6 +1422,9 @@ vala + + vala + @@ -1434,6 +1536,9 @@ + + tpm2-tss-devel + diff --git a/contrib/ci/void.sh b/contrib/ci/void.sh new file mode 100755 index 000000000..901230c57 --- /dev/null +++ b/contrib/ci/void.sh @@ -0,0 +1,26 @@ +#!/bin/sh +set -e +set -x + +#install dependencies +xbps-install -Suy python3 +./contrib/ci/generate_dependencies.py | xargs xbps-install -y + +#clone test firmware +if [ "$CI_NETWORK" = "true" ]; then + ./contrib/ci/get_test_firmware.sh + export G_TEST_SRCDIR=`pwd`/fwupd-test-firmware/installed-tests +fi + +#build +rm -rf build +meson build \ + -Dman=false \ + -Ddocs=none \ + -Dgusb:tests=false \ + -Dgcab:docs=false \ + -Dconsolekit=false \ + -Dsystemd=false \ + -Db_lto=false \ + -Delogind=true +ninja -C build test -v