From 24135c8c8e8980bebb58b592d38f1a4f1be81c50 Mon Sep 17 00:00:00 2001
From: Jon Turney <jon.turney@dronecode.org.uk>
Date: Thu, 10 Jun 2021 20:34:24 +0100
Subject: Set MESON_CI_JOBNAME for all CI jobs

Set MESON_CI_JOBNAME for all CI jobs which run project tests.

(Note that ${{ github.job }} is the literal job.id used in the yaml, not
any name given to the job with job.id.name, and so is the same for all
matrix entries, and thus not suitable for our purposes there).
---
 .github/workflows/cygwin.yml                   |  2 ++
 .github/workflows/macos.yml                    | 12 +++++++++++-
 .github/workflows/msys2.yml                    |  2 ++
 .github/workflows/nonative.yml                 |  3 +++
 .github/workflows/unusedargs_missingreturn.yml |  3 +++
 ci/azure-steps.yml                             |  2 ++
 6 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/cygwin.yml b/.github/workflows/cygwin.yml
index 3954094..f86b404 100644
--- a/.github/workflows/cygwin.yml
+++ b/.github/workflows/cygwin.yml
@@ -24,6 +24,8 @@ jobs:
         include:
           - NAME: gccx64ninja
             ARCH: x86_64
+    env:
+      MESON_CI_JOBNAME: cygwin-${{ matrix.NAME }}
 
     steps:
       # cache should be saved on failure, but the action doesn't support that
diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index c7ef7d3..df30371 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -43,8 +43,18 @@ jobs:
   project-tests-appleclang:
     runs-on: macos-latest
     strategy:
+      fail-fast: false
       matrix:
-        unity: ["on", "off"]
+        include:
+        - NAME: macos-clang
+          unity: off
+        - NAME: macos-clang-unity
+          unity: on
+
+    name: ${{ matrix.NAME }}
+    env:
+      MESON_CI_JOBNAME: ${{ matrix.NAME }}
+
     steps:
     - uses: actions/checkout@v2
     # use python3 from homebrew because it is a valid framework, unlike the actions one:
diff --git a/.github/workflows/msys2.yml b/.github/workflows/msys2.yml
index 64a0979..4a35b0a 100644
--- a/.github/workflows/msys2.yml
+++ b/.github/workflows/msys2.yml
@@ -40,6 +40,8 @@ jobs:
             MSYS2_CURSES:
             COMPILER: clang
             TOOLCHAIN: clang
+    env:
+      MESON_CI_JOBNAME: msys2-${{ matrix.NAME }}
 
     defaults:
       run:
diff --git a/.github/workflows/nonative.yml b/.github/workflows/nonative.yml
index c4bad95..d6bdfa6 100644
--- a/.github/workflows/nonative.yml
+++ b/.github/workflows/nonative.yml
@@ -22,6 +22,9 @@ jobs:
   cross-only-armhf:
     runs-on: ubuntu-latest
     container: mesonbuild/eoan:latest
+    env:
+      MESON_CI_JOBNAME: ubuntu-${{ github.job }}
+
     steps:
     - run: |
         apt-get -y purge clang gcc gdc
diff --git a/.github/workflows/unusedargs_missingreturn.yml b/.github/workflows/unusedargs_missingreturn.yml
index 8e6e42d..7b4379b 100644
--- a/.github/workflows/unusedargs_missingreturn.yml
+++ b/.github/workflows/unusedargs_missingreturn.yml
@@ -47,6 +47,8 @@ jobs:
         sudo apt install -yq --no-install-recommends g++ gfortran ninja-build gobjc gobjc++
         python -m pip install coverage codecov
     - run: ./tools/run_with_cov.py run_project_tests.py --only cmake common fortran platform-linux "objective c" "objective c++"
+      env:
+        MESON_CI_JOBNAME: linux-ubuntu-gcc-werror
     - name: Upload coverage report
       run: ./ci/upload_cov.sh "UnusedMissingReturn"
 
@@ -65,6 +67,7 @@ jobs:
         CC: gcc
         CXX: g++
         FC: gfortran
+        MESON_CI_JOBNAME: msys2-gcc-werror
 
     - name: Upload coverage report
       run: ./ci/upload_cov.sh "UnusedMissingReturn Windows"
diff --git a/ci/azure-steps.yml b/ci/azure-steps.yml
index 233bbfa..8aba224 100644
--- a/ci/azure-steps.yml
+++ b/ci/azure-steps.yml
@@ -3,6 +3,8 @@ steps:
   inputs:
     targetType: 'filePath'
     filePath: .\ci\run.ps1
+  env:
+    MESON_CI_JOBNAME: azure-$(System.JobName)
 
 - task: PublishTestResults@2
   inputs:
-- 
cgit v1.1