github actions: Build on ubuntu:rolling

1 files changed, 17 insertions, 83 deletions

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 7fd900ef..d829e718 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -59,9 +59,17 @@ env:
     clang-tools
 
 jobs:
-  build:
-    name: Build on Ubuntu
+  # Build on Debian and compatible
+  debian-based-build:
+    name: Build on ${{matrix.container}} with in-process=${{matrix.in-process}}
     runs-on: ubuntu-latest
+    container: ${{matrix.container}}
+
+    strategy:
+      fail-fast: false
+      matrix:
+        in-process: [all, none]
+        container: ['debian:testing', 'ubuntu:rolling']
 
     env:
       CC: ccache gcc
@@ -78,6 +86,12 @@ jobs:
         run: env | sort
         if: ${{ env.DEBUG == '1' }}
 
+      - name: Install dependencies
+        run: |
+          apt-get update -qq
+          apt-get install --assume-yes --no-install-recommends \
+            ${BUILD_DEPS} ${LIBRARY_DEPS}
+
       - uses: actions/checkout@v3
         with:
           path: mate-panel
@@ -92,12 +106,6 @@ jobs:
           path: mate-desktop
           submodules: true
 
-      - name: Install dependencies
-        run: |
-          sudo apt-get update -qq
-          sudo apt-get install --assume-yes --no-install-recommends \
-            ${BUILD_DEPS} ${LIBRARY_DEPS}
-
       - name: ccache
         uses: hendrikmuhs/[email protected]
 
@@ -117,7 +125,7 @@ jobs:
         run: |
           cd mate-panel
           NOCONFIGURE=1 ./autogen.sh
-          { ./configure ${CONFIGURE_FLAGS} || { cat config.log; exit 1; } ; }
+          { ./configure ${CONFIGURE_FLAGS} --with-in-process-applets=${{matrix.in-process}} || { cat config.log; exit 1; } ; }
 
       - name: Build
         run: make -C mate-panel -j ${{ env.JOBS }}
@@ -147,77 +155,3 @@ jobs:
 
       - name: cppcheck
         run: cppcheck --enable=warning,style,performance,portability,information,missingInclude -i'gtk-layer-shell-build' .
-
-  debian-testing-build:
-    name: Build on Debian Testing with in-process=${{matrix.in-process}}
-    runs-on: ubuntu-latest
-    container: debian:testing
-
-    strategy:
-      fail-fast: false
-      matrix:
-        in-process: [all, none]
-
-    env:
-      CC: ccache gcc
-      CXX: ccache g++
-      BASE_INSTALL_PATH: ${{github.workspace}}/_install
-
-    steps:
-      - name: Setup environment
-        run: |
-          echo "PATH=${BASE_INSTALL_PATH}/bin:${PATH}" >> "$GITHUB_ENV"
-          echo "PKG_CONFIG_PATH=${BASE_INSTALL_PATH}/lib/pkgconfig:${PKG_CONFIG_PATH}" >> "$GITHUB_ENV"
-
-      - name: Show environment
-        run: env | sort
-        if: ${{ env.DEBUG == '1' }}
-
-      - name: Install dependencies
-        run: |
-          apt-get update -qq
-          apt-get install --assume-yes --no-install-recommends \
-            ${BUILD_DEPS} ${LIBRARY_DEPS}
-
-      - uses: actions/checkout@v3
-        with:
-          path: mate-panel
-          submodules: true
-
-      - name: Checkout mate-desktop
-        uses: actions/checkout@v3
-        with:
-          repository: mate-desktop/mate-desktop
-          ref: v1.27.1
-          path: mate-desktop
-          submodules: true
-
-      - name: ccache
-        uses: hendrikmuhs/[email protected]
-
-      - name: Configure mate-desktop
-        run: |
-          cd mate-desktop
-          NOCONFIGURE=1 ./autogen.sh
-          { ./configure --prefix="$BASE_INSTALL_PATH" || { cat config.log; exit 1; } ; }
-
-      - name: Build mate-desktop
-        run: make -C mate-desktop -j ${{ env.JOBS }}
-
-      - name: Install mate-desktop
-        run: make -C mate-desktop -j ${{ env.JOBS }} install
-
-      - name: Configure
-        run: |
-          cd mate-panel
-          NOCONFIGURE=1 ./autogen.sh
-          { ./configure ${CONFIGURE_FLAGS} --with-in-process-applets=${{matrix.in-process}} || { cat config.log; exit 1; } ; }
-
-      - name: Build
-        run: make -C mate-panel -j ${{ env.JOBS }}
-
-      - name: Run Tests
-        run: make -C mate-panel -j ${{ env.JOBS }} check
-
-      - name: Run distcheck
-        run: make -C mate-panel -j ${{ env.JOBS }} distcheck