From ba5e86ececa17117fd1d5df57d59788d7eb379e6 Mon Sep 17 00:00:00 2001
From: Michael Wallner <mike@php.net>
Date: Fri, 2 Oct 2020 22:00:12 +0200
Subject: [PATCH] contexts here, contexts there...

---
 .github/workflows/cmake-build-ci.gen | 12 +++++++++---
 .github/workflows/cmake-build-ci.yml |  6 +++---
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/cmake-build-ci.gen b/.github/workflows/cmake-build-ci.gen
index feaa0f6e..b9ce97fe 100755
--- a/.github/workflows/cmake-build-ci.gen
+++ b/.github/workflows/cmake-build-ci.gen
@@ -147,6 +147,12 @@ function steps($splat_map = null) {
   steps_build();
 }
 
+function defaults() {
+  $os_ver = DEF[DEF["os"]];
+  $cc_vnd = DEF[$os_ver];
+  $cc_ver = DEF[$cc_vnd]["ver"];
+  return "$os_ver, $cc_vnd, $cc_ver";
+}
 ?>
 name: cmake-build-ci
 on:
@@ -178,7 +184,7 @@ jobs:
 
   # new memcached
   ci-new:
-    name: ci-dbg (<?=DEF[DEF["os"]]?> ${{ env.CC_VND }} ${{ env.CC_VER }} memcached-1.6)
+    name: ci-dbg (<?=defaults()?>, memcached-1.6)
     runs-on: <?=DEF[DEF["os"]]?> #
     env:
       INSTALL_MEMCACHED:
@@ -212,7 +218,7 @@ jobs:
 
   # sanitizer build
   ci-san:
-    name: ci-dbg (<?=DEF[DEF["os"]]?> ${{ env.CC_VND }} ${{ env.CC_VER }} sanitizers)
+    name: ci-dbg (<?=defaults()?>, sanitizers)
     runs-on: <?=DEF[DEF["os"]]?> #
     env:
       ENABLE_SANITIZERS: "address;undefined"
@@ -222,7 +228,7 @@ jobs:
 
   # coverage build
   ci-cov:
-    name: ci-dbg (<?=DEF[DEF["os"]]?> ${{ env.CC_VND }} ${{ env.CC_VER }} coverage)
+    name: ci-dbg (<?=defaults()?>, coverage)
     runs-on: <?=DEF[DEF["os"]]?> #
     env:
       CFLAGS: -O0 --coverage
diff --git a/.github/workflows/cmake-build-ci.yml b/.github/workflows/cmake-build-ci.yml
index a8ed2174..67d1022a 100644
--- a/.github/workflows/cmake-build-ci.yml
+++ b/.github/workflows/cmake-build-ci.yml
@@ -29,7 +29,7 @@ jobs:
 
   # new memcached
   ci-new:
-    name: ci-dbg (ubuntu-20.04 ${{ env.CC_VND }} ${{ env.CC_VER }} memcached-1.6)
+    name: ci-dbg (ubuntu-20.04, gnu, cur, memcached-1.6)
     runs-on: ubuntu-20.04 #
     env:
       INSTALL_MEMCACHED:
@@ -79,7 +79,7 @@ jobs:
 
   # sanitizer build
   ci-san:
-    name: ci-dbg (ubuntu-20.04 ${{ env.CC_VND }} ${{ env.CC_VER }} sanitizers)
+    name: ci-dbg (ubuntu-20.04, gnu, cur, sanitizers)
     runs-on: ubuntu-20.04 #
     env:
       ENABLE_SANITIZERS: "address;undefined"
@@ -107,7 +107,7 @@ jobs:
 
   # coverage build
   ci-cov:
-    name: ci-dbg (ubuntu-20.04 ${{ env.CC_VND }} ${{ env.CC_VER }} coverage)
+    name: ci-dbg (ubuntu-20.04, gnu, cur, coverage)
     runs-on: ubuntu-20.04 #
     env:
       CFLAGS: -O0 --coverage
-- 
2.30.2