From 49e5b88204287b90ee65ed0ff0266d5139e913b4 Mon Sep 17 00:00:00 2001
From: Damien-Chen <inkfan130924783@gmail.com>
Date: Thu, 10 Oct 2024 19:09:57 +0800
Subject: [PATCH] resolve conflict.

---
 .github/workflows/build.yml           | 2 +-
 .github/workflows/reusable-ubuntu.yml | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index afae2d3d0f2022..1f0945e50447da 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -202,7 +202,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-22.04]
+        os: [ubuntu-24.04]
         openssl_ver: [3.0.15, 3.1.7, 3.2.3, 3.3.2]
     env:
       OPENSSL_VER: ${{ matrix.openssl_ver }}
diff --git a/.github/workflows/reusable-ubuntu.yml b/.github/workflows/reusable-ubuntu.yml
index 796b3481feddf1..00b5a78b3a463e 100644
--- a/.github/workflows/reusable-ubuntu.yml
+++ b/.github/workflows/reusable-ubuntu.yml
@@ -16,7 +16,11 @@ jobs:
   build_ubuntu_reusable:
     name: 'build and test'
     timeout-minutes: 60
-    runs-on: ubuntu-24.04
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-24.04]
     env:
       FORCE_COLOR: 1
       OPENSSL_VER: 3.0.15