From a6b5aba4ac5bf38e74804996b218181454b89d55 Mon Sep 17 00:00:00 2001 From: Colomban Wendling Date: Tue, 14 Nov 2023 18:21:19 +0100 Subject: github-actions: Split mate-desktop deps for clarity --- .github/workflows/build.yml | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 75b04712..1a2f0932 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -40,6 +40,8 @@ env: libwnck-3-dev libx11-dev libxrandr-dev + # mate-desktop dependencies + DEB_LIBRARY_DEPS_MATE_DESKTOP: | libgirepository1.0-dev DEB_BUILD_DEPS: | ccache @@ -54,6 +56,8 @@ env: mate-common meson yelp-tools + # mate-desktop dependencies + DEB_BUILD_DEPS_MATE_DESKTOP: | iso-codes gobject-introspection # TODO @@ -61,7 +65,6 @@ env: clang clang-tools # Useful URL: https://git.archlinux.org/svntogit/community.git/tree/mate-panel - # + mate-desktop dependencies ARCH_BUILD_DEPS: | ccache autoconf-archive @@ -82,6 +85,8 @@ env: meson which yelp-tools + # mate-desktop dependencies + ARCH_BUILD_DEPS_MATE_DESKTOP: | iso-codes gobject-introspection @@ -123,7 +128,8 @@ jobs: run: | apt-get update -qq apt-get install --assume-yes --no-install-recommends \ - ${DEB_BUILD_DEPS} ${DEB_LIBRARY_DEPS} + ${DEB_BUILD_DEPS} ${DEB_BUILD_DEPS_MATE_DESKTOP} \ + ${DEB_LIBRARY_DEPS} ${DEB_LIBRARY_DEPS_MATE_DESKTOP} # For ArchLinux - name: Install dependencies @@ -133,7 +139,7 @@ jobs: # https://wiki.archlinux.org/title/System_maintenance#Partial_upgrades_are_unsupported run: | pacman --noconfirm -Sy - pacman --noconfirm -S ${ARCH_BUILD_DEPS} + pacman --noconfirm -S ${ARCH_BUILD_DEPS} ${ARCH_BUILD_DEPS_MATE_DESKTOP} # Checkout the repository - uses: actions/checkout@v3 @@ -211,7 +217,7 @@ jobs: run: | sudo apt-get update -qq sudo apt-get install --assume-yes --no-install-recommends \ - cppcheck ${DEB_LIBRARY_DEPS} + cppcheck ${DEB_LIBRARY_DEPS} ${DEB_LIBRARY_DEPS_MATE_DESKTOP} - name: cppcheck run: cppcheck --enable=warning,style,performance,portability,information,missingInclude -i'gtk-layer-shell-build' . -- cgit v1.2.1