From 9d5bc5cc6cf97d8a1d8b7cdab2edbca04162f93f Mon Sep 17 00:00:00 2001
From: Benign X <1341398182@qq.com>
Date: Tue, 12 Mar 2024 21:09:53 +0800
Subject: [PATCH] feat(ci): update distro to ubuntu 22.02 to fix freetype build
 problem (#5834)

---
 .github/workflows/ccpp.yml | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml
index 9d691312c0..4b675c096b 100644
--- a/.github/workflows/ccpp.yml
+++ b/.github/workflows/ccpp.yml
@@ -59,8 +59,13 @@ jobs:
     # Run steps on a matrix of 3 arch/distro combinations
     strategy:
       matrix:
-        arch: [ 'aarch64', 'armv6', 'armv7' ]
-
+        include:
+          - arch: aarch64
+            distro: ubuntu22.04
+          - arch: armv6
+            distro: bullseye
+          - arch: armv7
+            distro: bullseye
     steps:
       - uses: actions/checkout@v4
       - uses: ammaraskar/gcc-problem-matcher@master
@@ -77,7 +82,7 @@ jobs:
         id: build
         with:
           arch: ${{ matrix.arch }}
-          distro: bullseye
+          distro: ${{ matrix.distro }}
 
           # Not required, but speeds up builds
           githubToken: ${{ github.token }}
@@ -95,7 +100,12 @@ jobs:
 
           install: |
             apt-get update -y
-            apt-get install build-essential ccache libgcc-10-dev python3 libpng-dev ruby-full gcovr cmake libjpeg62-turbo-dev libfreetype6-dev libasan6 pngquant python3-pip libinput-dev libxkbcommon-dev libdrm-dev pkg-config ninja-build -q -y
+            if [[ "${{ matrix.distro }}" == "ubuntu22.04" ]]; then
+              apt-get install libjpeg-turbo8-dev -q -y
+            else
+              apt-get install libjpeg62-turbo-dev -q -y
+            fi
+            apt-get install build-essential ccache libgcc-10-dev python3 libpng-dev ruby-full gcovr cmake libfreetype6-dev libasan6 pngquant python3-pip libinput-dev libxkbcommon-dev libdrm-dev pkg-config ninja-build -q -y
             pip install pypng lz4
             /usr/sbin/update-ccache-symlinks
             echo 'export PATH="/usr/lib/ccache:$PATH"' | tee -a ~/.bashrc