From 194404e1e977d9453c3ebc01591ca908b1658b1e Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Thu, 3 Oct 2024 17:02:45 +0100 Subject: [PATCH] ci/actions: LC_ALL=C sort the packages I'm about to add some more and the current (almost sorted) state breaks my brain :-x Signed-off-by: Emil Velikov Link: https://github.com/kmod-project/kmod/pull/172 Signed-off-by: Lucas De Marchi --- .github/actions/setup-archlinux/action.yml | 6 +++--- .github/actions/setup-debian/action.yml | 4 ++-- .github/actions/setup-fedora/action.yml | 18 +++++++++--------- .github/actions/setup-ubuntu/action.yml | 4 ++-- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/.github/actions/setup-archlinux/action.yml b/.github/actions/setup-archlinux/action.yml index 95752089..21c0e68b 100644 --- a/.github/actions/setup-archlinux/action.yml +++ b/.github/actions/setup-archlinux/action.yml @@ -20,9 +20,9 @@ runs: pacman --noconfirm -Sy archlinux-keyring pacman --noconfirm -Su \ + git \ + gtk-doc \ linux-headers \ meson \ rsync \ - scdoc \ - git \ - gtk-doc + scdoc diff --git a/.github/actions/setup-debian/action.yml b/.github/actions/setup-debian/action.yml index 4a0e04cb..d1b27674 100644 --- a/.github/actions/setup-debian/action.yml +++ b/.github/actions/setup-debian/action.yml @@ -13,14 +13,14 @@ runs: run: | apt-get update apt-get install --yes \ - build-essential \ autoconf \ automake \ + build-essential \ gcc-multilib \ git \ gtk-doc-tools \ - libssl-dev \ liblzma-dev \ + libssl-dev \ libtool \ libzstd-dev \ linux-headers-generic \ diff --git a/.github/actions/setup-fedora/action.yml b/.github/actions/setup-fedora/action.yml index 0e31a58b..28a2a0d3 100644 --- a/.github/actions/setup-fedora/action.yml +++ b/.github/actions/setup-fedora/action.yml @@ -15,24 +15,24 @@ runs: dnf install -y \ autoconf \ automake \ - make \ gcc \ - kernel-devel \ - zlib-devel \ - xz-devel \ - libzstd-devel \ - meson \ - openssl-devel \ git \ gtk-doc \ + kernel-devel \ libasan \ libhwasan \ liblsan \ + libtool \ libtsan \ libubsan \ - libtool \ + libzstd-devel \ + make \ + meson \ + openssl-devel \ rsync \ - scdoc + scdoc \ + xz-devel \ + zlib-devel # CI builds with KDIR pointing to /usr/lib/modules/*/build # so just a foo/build pointing to the right place, assuming # just one kernel installed diff --git a/.github/actions/setup-ubuntu/action.yml b/.github/actions/setup-ubuntu/action.yml index 1e3a789c..19366e09 100644 --- a/.github/actions/setup-ubuntu/action.yml +++ b/.github/actions/setup-ubuntu/action.yml @@ -13,14 +13,14 @@ runs: run: | apt-get update apt-get install --yes \ - build-essential \ autoconf \ automake \ + build-essential \ gcc-multilib \ git \ gtk-doc-tools \ - libssl-dev \ liblzma-dev \ + libssl-dev \ libtool \ libzstd-dev \ linux-headers-generic \ -- 2.47.3