From d30c3f4823177e416f5e40704ecbda1e8a96c625 Mon Sep 17 00:00:00 2001
From: Ailin Nemui <ailin@d5421s.localdomain>
Date: Mon, 16 Dec 2024 19:57:30 +0100
Subject: [PATCH] add glib dependency to github workflows

(cherry picked from commit a775f50572bc7751b5ff01e7aa3e2e2d3ea5d262)
---
 .github/workflows/abicheck.yml |  2 +-
 .github/workflows/check.yml    | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/abicheck.yml b/.github/workflows/abicheck.yml
index 3ac39146..7f54450f 100644
--- a/.github/workflows/abicheck.yml
+++ b/.github/workflows/abicheck.yml
@@ -3,7 +3,7 @@ name: abicheck
 env:
   build_options: -Dbuildtype=debug -Denable-true-color=yes -Dwith-proxy=yes -Dc_args=-DPERL_EUPXS_ALWAYS_EXPORT
   prefix: /usr/local
-  apt_build_deps: ninja-build libutf8proc-dev libperl-dev libotr5-dev
+  apt_build_deps: ninja-build libutf8proc-dev libperl-dev libotr5-dev libglib2.0-dev
   get_pip_build_deps: pip3 install setuptools; pip3 install wheel; pip3 install 'meson<0.59.0'
   getabidef_def: getabidef() { awk '$1=="#define" && $2=="IRSSI_ABI_VERSION" { print $3 }' "$1"/include/irssi/src/common.h; }
 jobs:
diff --git a/.github/workflows/check.yml b/.github/workflows/check.yml
index 973f8a06..37103672 100644
--- a/.github/workflows/check.yml
+++ b/.github/workflows/check.yml
@@ -5,7 +5,7 @@ on:
   pull_request:
 name: Check Irssi
 env:
-  apt_build_deps: libutf8proc-dev libperl-dev libotr5-dev
+  apt_build_deps: libutf8proc-dev libperl-dev libotr5-dev libglib2.0-dev
   apt_build_deps_meson: ninja-build
   apt_build_deps_autotools: autoconf automake libtool
   get_pip_build_deps_meson: pip3 install setuptools${setuptools_ver}; pip3 install wheel; pip3 install meson${meson_ver}
@@ -38,18 +38,18 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-18.04, ubuntu-latest]
+        os: [ubuntu-20.04, ubuntu-latest]
         builder: [meson, configure]
         compiler: [clang, gcc]
         flags: [regular]
         include:
-          - os: ubuntu-18.04
+          - os: ubuntu-20.04
             builder: meson
-            meson_ver: ==0.49.2
+            meson_ver: ==0.53.2
             setuptools_ver: <51
           - os: ubuntu-latest
             builder: meson
-            meson_ver: <0.60.0
+            meson_ver: <0.63.0
           - os: ubuntu-latest
             builder: meson
             flags: meson-latest FAILURE-OK