From 76fa76f99427ef1e0a8302003fcad215da157a2d Mon Sep 17 00:00:00 2001
From: Corentin Le Molgat <corentinl@google.com>
Date: Wed, 25 Oct 2023 11:25:21 +0200
Subject: [PATCH] ci: rework docker workflows

---
 .github/workflows/amd64_docker_bazel.yml | 15 ++++----
 .github/workflows/amd64_docker_cmake.yml | 45 ++++++++++++------------
 2 files changed, 28 insertions(+), 32 deletions(-)

diff --git a/.github/workflows/amd64_docker_bazel.yml b/.github/workflows/amd64_docker_bazel.yml
index 89cde0d312..e2b7a42eb8 100644
--- a/.github/workflows/amd64_docker_bazel.yml
+++ b/.github/workflows/amd64_docker_bazel.yml
@@ -5,22 +5,19 @@ on: [push, pull_request, workflow_dispatch]
 
 jobs:
   bazel:
-    runs-on: ubuntu-latest
-    continue-on-error: ${{ matrix.allow_failure }}
     strategy:
       matrix:
         distro: [alpine, archlinux, centos, debian, fedora, opensuse, ubuntu]
-        allow_failure: [false]
       fail-fast: false
-    env:
-      DISTRO: ${{ matrix.distro }}
+    name: ${{ matrix.distro }} • Bazel • C++
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
       - name: Build env image
-        run: make --directory=bazel ${DISTRO}_env
+        run: make --directory=bazel ${{ matrix.distro }}_env
       - name: Build devel image
-        run: make --directory=bazel ${DISTRO}_devel
+        run: make --directory=bazel ${{ matrix.distro }}_devel
       - name: Build project
-        run: make --directory=bazel ${DISTRO}_build
+        run: make --directory=bazel ${{ matrix.distro }}_build
       - name: Test project
-        run: make --directory=bazel ${DISTRO}_test
+        run: make --directory=bazel ${{ matrix.distro }}_test
diff --git a/.github/workflows/amd64_docker_cmake.yml b/.github/workflows/amd64_docker_cmake.yml
index c87c1c9c62..d96a34ad11 100644
--- a/.github/workflows/amd64_docker_cmake.yml
+++ b/.github/workflows/amd64_docker_cmake.yml
@@ -1,36 +1,35 @@
+# ref: https://github.com/actions/runner-images
 name: amd64 Docker CMake
 
 on: [push, pull_request, workflow_dispatch]
 
 jobs:
   cmake:
-    runs-on: ubuntu-latest
     strategy:
       matrix:
         distro: [alpine, archlinux, centos, debian, fedora, opensuse, ubuntu]
         lang: [cpp, python, dotnet, java]
       fail-fast: false
-    env:
-      DISTRO: ${{ matrix.distro }}
-      LANG: ${{ matrix.lang }}
+    name: ${{ matrix.distro }} • CMake • ${{ matrix.lang }}
+    runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
-    - name: Build base image
-      run: make --directory=cmake ${DISTRO}_base
-    - name: Build env image
-      run: make --directory=cmake ${DISTRO}_${LANG}_env
-    - name: Build devel image
-      run: make --directory=cmake ${DISTRO}_${LANG}_devel
-    - name: Build project
-      run: make --directory=cmake ${DISTRO}_${LANG}_build
-    - name: Test project
-      run: make --directory=cmake ${DISTRO}_${LANG}_test
+      - uses: actions/checkout@v4
+      - name: Build base image
+        run: make --directory=cmake ${{ matrix.distro }}_base
+      - name: Build env image
+        run: make --directory=cmake ${{ matrix.distro }}_${{ matrix.lang }}_env
+      - name: Build devel image
+        run: make --directory=cmake ${{ matrix.distro }}_${{ matrix.lang }}_devel
+      - name: Build project
+        run: make --directory=cmake ${{ matrix.distro }}_${{ matrix.lang }}_build
+      - name: Test project
+        run: make --directory=cmake ${{ matrix.distro }}_${{ matrix.lang }}_test
 
-    - name: Build Install env image
-      run: make --directory=cmake ${DISTRO}_${LANG}_install_env
-    - name: Build Install devel image
-      run: make --directory=cmake ${DISTRO}_${LANG}_install_devel
-    - name: Build Install
-      run: make --directory=cmake ${DISTRO}_${LANG}_install_build
-    - name: Test Install
-      run: make --directory=cmake ${DISTRO}_${LANG}_install_test
+      - name: Build install env image
+        run: make --directory=cmake ${{ matrix.distro }}_${{ matrix.lang }}_install_env
+      - name: Build install devel image
+        run: make --directory=cmake ${{ matrix.distro }}_${{ matrix.lang }}_install_devel
+      - name: Build install project
+        run: make --directory=cmake ${{ matrix.distro }}_${{ matrix.lang }}_install_build
+      - name: Test install project
+        run: make --directory=cmake ${{ matrix.distro }}_${{ matrix.lang }}_install_test