From 2cc8f888a9a3601388c308cfc294fc8e20f6bdb9 Mon Sep 17 00:00:00 2001
From: Jiri Malak <malak.jiri@gmail.com>
Date: Tue, 21 Jan 2025 18:55:34 +0100
Subject: [PATCH] build: restructure build matrixes

add architecture to build matrixes to simplify multiple architectures configuration
---
 .github/workflows/ci-build.yml | 29 ++++++++++++++++-------------
 .github/workflows/release.yml  | 24 ++++++++++++------------
 2 files changed, 28 insertions(+), 25 deletions(-)

diff --git a/.github/workflows/ci-build.yml b/.github/workflows/ci-build.yml
index f36bfca014..15a4d18130 100644
--- a/.github/workflows/ci-build.yml
+++ b/.github/workflows/ci-build.yml
@@ -70,18 +70,20 @@ jobs:
       matrix:
         include:
         - owtools: 'GCC'
+          arch:    'x64'
+          image:   'ubuntu-latest'
           tools:   'gcc'
-          title:   'x64 gcc'
         - owtools: 'CLANG'
+          arch:    'x64'
+          image:   'ubuntu-latest'
           tools:   'clang'
-          title:   'x64 clang'
-    name: Linux ${{ matrix.title }}
+    name: Linux ${{ matrix.arch }} ${{ matrix.tools }}
     uses: "./.github/workflows/cibldlnx.yml"
     with:
-      arch:         'x64'
+      arch:         ${{ matrix.arch }}
       tools:        ${{ matrix.tools }}
       owtools:      ${{ matrix.owtools }}
-      image:        'ubuntu-latest'
+      image:        ${{ matrix.image }}
       owdebug:      ${{ vars.OWDEBUG }}
   Windows:
     needs:
@@ -90,15 +92,16 @@ jobs:
       matrix:
         include:
         - owtools: 'VISUALC'
+          arch:    'x64'
+          image:   'windows-2022'
           tools:   'vs2022'
-          title:   'x64 vs2022'
-    name: Windows ${{ matrix.title }}
+    name: Windows ${{ matrix.arch }} ${{ matrix.tools }}
     uses: "./.github/workflows/cibldnt.yml"
     with:
-      arch:         'x64'
+      arch:         ${{ matrix.arch }}
       tools:        ${{ matrix.tools }}
       owtools:      ${{ matrix.owtools }}
-      image:        'windows-2022'
+      image:        ${{ matrix.image }}
       owdebug:      ${{ vars.OWDEBUG }}
   OSX:
     needs: start-start
@@ -108,18 +111,18 @@ jobs:
         - owtools:  'CLANG'
           arch:     'x64'
           image:    'macos-13'
+          tools:    'clang'
           relpath:  'rel bino64'
-          title:    'x64 clang'
         - owtools:  'CLANG'
           arch:     'a64'
           image:    'macos-14'
+          tools:    'clang'
           relpath:  'rel armo64'
-          title:    'arm64 clang'
-    name: OSX ${{ matrix.title }}
+    name: OSX ${{ matrix.arch }} ${{ matrix.tools }}
     uses: "./.github/workflows/cibldosx.yml"
     with:
       arch:         ${{ matrix.arch }}
-      tools:        'clang'
+      tools:        ${{ matrix.tools }}
       relpath:      ${{ matrix.relpath }}
       owtools:      ${{ matrix.owtools }}
       image:        ${{ matrix.image }}
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index d63fed0e4a..0ed967dd0c 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -30,13 +30,13 @@ jobs:
       matrix:
         include:
         - owtools: 'GCC'
-          tools:   'gcc'
+          arch:    'x64'
           image:   'ubuntu-20.04'
-          title:   'x64 gcc'
-    name: Linux ${{ matrix.title }}
+          tools:   'gcc'
+    name: Linux ${{ matrix.arch }} ${{ matrix.tools }}
     uses: "./.github/workflows/rel-lnx.yml"
     with:
-      arch:         'x64'
+      arch:         ${{ matrix.arch }}
       tools:        ${{ matrix.tools }}
       owtools:      ${{ matrix.owtools }}
       image:        ${{ matrix.image }}
@@ -48,13 +48,13 @@ jobs:
       matrix:
         include:
         - owtools: 'VISUALC'
-          tools:   'vs2019'
+          arch:    'x64'
           image:   'windows-2019'
-          title:   'x64 vs2019'
-    name: Windows ${{ matrix.title }}
+          tools:   'vs2019'
+    name: Windows ${{ matrix.arch }} ${{ matrix.tools }}
     uses: "./.github/workflows/rel-nt.yml"
     with:
-      arch:         'x64'
+      arch:         ${{ matrix.arch }}
       tools:        ${{ matrix.tools }}
       owtools:      ${{ matrix.owtools }}
       image:        ${{ matrix.image }}
@@ -68,18 +68,18 @@ jobs:
         - owtools: 'CLANG'
           arch:    'x64'
           image:   'macos-13'
+          tools:   'clang'
           relpath: 'rel bino64'
-          title:   'x64 clang'
         - owtools: 'CLANG'
           arch:    'a64'
           image:   'macos-14'
+          tools:   'clang'
           relpath: 'rel armo64'
-          title:   'arm64 clang'
-    name: OSX ${{ matrix.title }}
+    name: OSX ${{ matrix.arch }} ${{ matrix.tools }}
     uses: "./.github/workflows/rel-osx.yml"
     with:
       arch:         ${{ matrix.arch }}
-      tools:        'clang'
+      tools:        ${{ matrix.tools }}
       relpath:      ${{ matrix.relpath }}
       owtools:      ${{ matrix.owtools }}
       image:        ${{ matrix.image }}