From 22df006dfb9f9ada1ee244e7499b8974dbac2b40 Mon Sep 17 00:00:00 2001
From: Ievgenii Meshcheriakov <eugen@debian.org>
Date: Thu, 24 Apr 2025 22:13:55 +0200
Subject: [PATCH] Simplify and modernize CI

Don't create unnecessary environment variables. Don't install packages
that are already installed on the runners. Query Homebrew for prefix
path. Use latest version of checkout action.
---
 .github/workflows/ci.yml | 30 +++++++++++++-----------------
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3ce9a44..bc1d97c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -6,9 +6,6 @@ on:
   pull_request:
     branches: [ master ]
 
-env:
-  BUILD_TYPE: Release
-
 jobs:
   build:
     strategy:
@@ -18,30 +15,29 @@ jobs:
         - macos-latest
         include:
         - os: ubuntu-latest
-          blocks: -DUNICODE_BLOCKS=/usr/share/unicode/Blocks.txt
-          install_packages: >
-            sudo apt update &&
-            sudo apt install cmake gettext libcairo2-dev libglib2.0-dev libfreetype6-dev libpango1.0-dev ninja-build pkg-config unicode-data
+          cmake_extra_args: -DUNICODE_BLOCKS=/usr/share/unicode/Blocks.txt
+          install_packages: |
+            sudo apt update
+            sudo apt install gettext libcairo2-dev libglib2.0-dev libfreetype6-dev libpango1.0-dev unicode-data
         - os: macos-latest
-          env:
-          - CMAKE_PREFIX_PATH: /usr/local/opt/gettext
-          install_packages: >
-            brew update &&
-            brew install cairo cmake fontconfig freetype gettext glib pango ninja pkg-config
+          cmake_extra_args: -DCMAKE_PREFIX_PATH=$(brew --prefix gettext)
+          install_packages: |
+            brew update
+            brew install pango
 
-    runs-on: ${{matrix.os}}
+    runs-on: ${{ matrix.os }}
 
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v4
 
     - name: Install Packages
       run: ${{ matrix.install_packages }}
 
     - name: Configure
-      run: cmake -GNinja -B${{ github.workspace }}/build -DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }} ${{ matrix.blocks }}
+      run: cmake -GNinja -Bbuild -Wdev -DCMAKE_BUILD_TYPE=Release ${{ matrix.cmake_extra_args }}
 
     - name: Build
-      run: cmake --build ${{ github.workspace }}/build -v
+      run: cmake --build build -v
 
     - name: Test
-      run: ${{ github.workspace }}/build/src/fntsample --help
+      run: build/src/fntsample --help