From dff1bc107d593b12e824cbc04b0d220f2ffeb967 Mon Sep 17 00:00:00 2001
From: Hennadii Stepanov <32963518+hebasto@users.noreply.github.com>
Date: Tue, 14 Oct 2025 12:23:54 +0100
Subject: [PATCH] ci, refactor: Generalize use of
 `matrix.configuration.env_vars`

---
 .github/workflows/ci.yml | 32 ++++++++++++++++++++++++++++----
 1 file changed, 28 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 7195b7da..07a574d0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -130,6 +130,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
+        configuration:
+          - env_vars: {}
         cc:
           - 'i686-linux-gnu-gcc'
           - 'clang --target=i686-pc-linux-gnu -isystem /usr/i686-linux-gnu/include'
@@ -148,6 +150,7 @@ jobs:
       - *CHECKOUT
 
       - name: CI script
+        env: ${{ matrix.configuration.env_vars }}
         uses: ./.github/actions/run-in-docker-action
         with:
           dockerfile: ./ci/linux-debian.Dockerfile
@@ -159,6 +162,11 @@ jobs:
     runs-on: ubuntu-latest
     needs: docker_cache
 
+    strategy:
+      matrix:
+        configuration:
+          - env_vars: {}
+
     env:
       WRAPPER_CMD: 'qemu-s390x'
       SECP256K1_TEST_ITERS: 16
@@ -176,6 +184,7 @@ jobs:
       - *CHECKOUT
 
       - name: CI script
+        env: ${{ matrix.configuration.env_vars }}
         uses: ./.github/actions/run-in-docker-action
         with:
           dockerfile: ./ci/linux-debian.Dockerfile
@@ -238,6 +247,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
+        configuration:
+          - env_vars: {}
         cc:
           - 'gcc'
           - 'clang'
@@ -248,6 +259,7 @@ jobs:
       - *CHECKOUT
 
       - name: CI script
+        env: ${{ matrix.configuration.env_vars }}
         uses: ./.github/actions/run-in-docker-action
         with:
           dockerfile: ./ci/linux-debian.Dockerfile
@@ -259,6 +271,11 @@ jobs:
     runs-on: ubuntu-latest
     needs: docker_cache
 
+    strategy:
+      matrix:
+        configuration:
+          - env_vars: {}
+
     env:
       WRAPPER_CMD: 'qemu-ppc64le'
       SECP256K1_TEST_ITERS: 16
@@ -276,6 +293,7 @@ jobs:
       - *CHECKOUT
 
       - name: CI script
+        env: ${{ matrix.configuration.env_vars }}
         uses: ./.github/actions/run-in-docker-action
         with:
           dockerfile: ./ci/linux-debian.Dockerfile
@@ -283,14 +301,14 @@ jobs:
       - *PRINT_LOGS
 
   valgrind_debian:
-    name: "Valgrind ${{ matrix.binary_arch }} (memcheck)"
-    runs-on: ${{ matrix.runner }}
+    name: "Valgrind ${{ matrix.configuration.binary_arch }} (memcheck)"
+    runs-on: ${{ matrix.configuration.runner }}
     needs: docker_cache
 
     strategy:
       fail-fast: false
       matrix:
-        include:
+        configuration:
           - runner: ubuntu-latest
             binary_arch: x64
             env_vars: { CC: 'clang',                                      ASM: 'auto' }
@@ -327,7 +345,7 @@ jobs:
       - *CHECKOUT
 
       - name: CI script
-        env: ${{ matrix.env_vars }}
+        env: ${{ matrix.configuration.env_vars }}
         uses: ./.github/actions/run-in-docker-action
         with:
           dockerfile: ./ci/linux-debian.Dockerfile
@@ -640,6 +658,11 @@ jobs:
     runs-on: ubuntu-latest
     needs: docker_cache
 
+    strategy:
+      matrix:
+        configuration:
+          - env_vars: {}
+
     env:
       CC: 'g++'
       CFLAGS: '-fpermissive -g'
@@ -656,6 +679,7 @@ jobs:
       - *CHECKOUT
 
       - name: CI script
+        env: ${{ matrix.configuration.env_vars }}
         uses: ./.github/actions/run-in-docker-action
         with:
           dockerfile: ./ci/linux-debian.Dockerfile