From 1f6a7e23ad1b0b76b9cdedd0a4acc5acfe538232 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Helleu?= <flashcode@flashtux.org>
Date: Mon, 19 Aug 2024 19:31:37 +0200
Subject: [PATCH] ci: regroup Ubuntu jobs

---
 .github/workflows/ci.yml | 158 +++++++++++++++++++--------------------
 1 file changed, 79 insertions(+), 79 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8dcf2e70b..cb890e7af 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -158,6 +158,85 @@ jobs:
         lcov --list coverage.info
         bash <(curl -s https://codecov.io/bash) -f coverage.info || echo 'Codecov error'
 
+  build_debian:
+
+    strategy:
+      matrix:
+        os:
+          - ubuntu-22.04
+
+    name: "${{ matrix.os }}: build Debian"
+    runs-on: ${{ matrix.os }}
+
+    steps:
+
+    - uses: actions/checkout@v2
+
+    - name: Install dependencies
+      run: |
+        sudo apt-get update -qq
+        sudo apt-get --yes --no-install-recommends install ${{ env.WEECHAT_UBUNTU_DEPS }}
+
+    - name: Test Debian patches
+      run: ./tools/build_debian.sh test-patches
+
+    - name: Build Debian packages
+      run: ./tools/build_debian.sh devel ubuntu/jammy
+
+    - name: Install Debian packages
+      run: sudo dpkg -i ../weechat-devel*.deb
+
+    - name: Run WeeChat
+      env:
+        TERM: xterm-256color
+      run: |
+        weechat --help
+        weechat-curses --help
+        weechat --version
+        weechat --build-info
+        weechat --run-command "/debug dirs;/debug libs" --run-command "/quit"
+
+  codeql-analysis:
+
+    strategy:
+      matrix:
+        os:
+          - ubuntu-22.04
+
+    name: "${{ matrix.os }}: CodeQL"
+    runs-on: ${{ matrix.os }}
+
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    steps:
+
+    - name: Checkout repository
+      uses: actions/checkout@v3
+
+    - name: Install dependencies
+      run: |
+        sudo apt-get update -qq
+        sudo apt-get --yes --no-install-recommends install ${{ env.WEECHAT_UBUNTU_DEPS }}
+        # uninstall php imagick as is causes a crash when loading php plugin (see #2009)
+        sudo apt-get --yes purge php8.1-imagick
+        sudo -H pip3 install --ignore-installed msgcheck
+
+    - name: Initialize CodeQL
+      uses: github/codeql-action/init@v3
+      with:
+        languages: cpp
+
+    - name: Autobuild
+      uses: github/codeql-action/autobuild@v3
+
+    - name: Perform CodeQL Analysis
+      uses: github/codeql-action/analyze@v3
+      with:
+        category: "/language:cpp"
+
   tests_rockylinux:
 
     strategy:
@@ -262,82 +341,3 @@ jobs:
         weechat --colors
         weechat --license
         weechat --run-command "/debug dirs;/debug libs" --run-command "/quit"
-
-  build_debian:
-
-    strategy:
-      matrix:
-        os:
-          - ubuntu-22.04
-
-    name: "${{ matrix.os }}: build Debian"
-    runs-on: ${{ matrix.os }}
-
-    steps:
-
-    - uses: actions/checkout@v2
-
-    - name: Install dependencies
-      run: |
-        sudo apt-get update -qq
-        sudo apt-get --yes --no-install-recommends install ${{ env.WEECHAT_UBUNTU_DEPS }}
-
-    - name: Test Debian patches
-      run: ./tools/build_debian.sh test-patches
-
-    - name: Build Debian packages
-      run: ./tools/build_debian.sh devel ubuntu/jammy
-
-    - name: Install Debian packages
-      run: sudo dpkg -i ../weechat-devel*.deb
-
-    - name: Run WeeChat
-      env:
-        TERM: xterm-256color
-      run: |
-        weechat --help
-        weechat-curses --help
-        weechat --version
-        weechat --build-info
-        weechat --run-command "/debug dirs;/debug libs" --run-command "/quit"
-
-  codeql-analysis:
-
-    strategy:
-      matrix:
-        os:
-          - ubuntu-22.04
-
-    name: "${{ matrix.os }}: CodeQL"
-    runs-on: ${{ matrix.os }}
-
-    permissions:
-      actions: read
-      contents: read
-      security-events: write
-
-    steps:
-
-    - name: Checkout repository
-      uses: actions/checkout@v3
-
-    - name: Install dependencies
-      run: |
-        sudo apt-get update -qq
-        sudo apt-get --yes --no-install-recommends install ${{ env.WEECHAT_UBUNTU_DEPS }}
-        # uninstall php imagick as is causes a crash when loading php plugin (see #2009)
-        sudo apt-get --yes purge php8.1-imagick
-        sudo -H pip3 install --ignore-installed msgcheck
-
-    - name: Initialize CodeQL
-      uses: github/codeql-action/init@v3
-      with:
-        languages: cpp
-
-    - name: Autobuild
-      uses: github/codeql-action/autobuild@v3
-
-    - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v3
-      with:
-        category: "/language:cpp"