From 7a8c78781b80368b4345681c8f6aa0480d3dfb73 Mon Sep 17 00:00:00 2001
From: Artem Gavrilov <artem.gavrilov@percona.com>
Date: Wed, 23 Apr 2025 15:54:24 +0200
Subject: [PATCH 1/2] PG-1467 Install meson with pip in CI scripts

Ubunut has outdated meson version in its repos. So intall it with pip
instead.
---
 ci_scripts/ubuntu-deps.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/ci_scripts/ubuntu-deps.sh b/ci_scripts/ubuntu-deps.sh
index f8028187dcfa7..4646bee3ad423 100755
--- a/ci_scripts/ubuntu-deps.sh
+++ b/ci_scripts/ubuntu-deps.sh
@@ -25,10 +25,13 @@ DEPS=(
     libzstd-dev
     lz4
     mawk
-    meson
     perl
     pkgconf
     python3-dev
+    python3
+    python3-pip
+    python3-setuptools
+    python3-wheel
     systemtap-sdt-dev
     tcl-dev
     uuid-dev
@@ -51,6 +54,7 @@ sudo apt-get update
 sudo apt-get install -y ${DEPS[@]}
 
 bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)"
+pip3 install meson
 
 # Vault
 wget -O - https://apt.releases.hashicorp.com/gpg | sudo tee /etc/apt/keyrings/hashicorp-archive-keyring.asc

From 338e53f81228c416bc1744caaf216dcf53eb8462 Mon Sep 17 00:00:00 2001
From: Artem Gavrilov <artem.gavrilov@percona.com>
Date: Thu, 17 Apr 2025 17:23:20 +0200
Subject: [PATCH 2/2] PG-1467 Add clang builds to CI

Add clang compiler to CI matrix
---
 .github/workflows/psp-matrix.yml   | 2 ++
 .github/workflows/psp-reusable.yml | 6 +++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/psp-matrix.yml b/.github/workflows/psp-matrix.yml
index ec64492a20913..4c1f3319e5fbb 100644
--- a/.github/workflows/psp-matrix.yml
+++ b/.github/workflows/psp-matrix.yml
@@ -12,11 +12,13 @@ jobs:
     strategy:
       matrix:
         os: ['ubuntu-22.04']
+        compiler: [gcc, clang]
         build_type: [debug,debugoptimized]
         build_script: [make, meson]
     uses: ./.github/workflows/psp-reusable.yml
     with:
         os: ${{ matrix.os }}
+        compiler: ${{ matrix.compiler }}
         build_type: ${{ matrix.build_type }}
         build_script: ${{ matrix.build_script }}
     secrets: inherit
diff --git a/.github/workflows/psp-reusable.yml b/.github/workflows/psp-reusable.yml
index 44742bab3ffc1..b6f4de3f90eef 100644
--- a/.github/workflows/psp-reusable.yml
+++ b/.github/workflows/psp-reusable.yml
@@ -5,6 +5,9 @@ on:
       os:
         type: string
         required: true
+      compiler:
+        type: string
+        required: true
       build_type:
         type: string
         required: true
@@ -13,7 +16,8 @@ on:
         required: true
 
 env:
-  artifact_name: build-${{ inputs.os }}-${{ inputs.build_script }}-${{ inputs.build_type }}
+  artifact_name: build-${{ inputs.os }}-${{ inputs.compiler }}-${{ inputs.build_script }}-${{ inputs.build_type }}
+  CC: ${{ inputs.compiler }}
 
 jobs:
   build: