From 723c7acc76fe80d9fd2ccc0da00e90bfc1183049 Mon Sep 17 00:00:00 2001
From: Daniel Mensinger <daniel@mensinger-ka.de>
Date: Fri, 3 Sep 2021 21:18:26 +0200
Subject: [PATCH] ci: Fix missing MESON_CI_JOBNAME in the image builders

---
 .github/workflows/os_comp.yml        | 3 ++-
 ci/ciimage/arch/image.json           | 3 ++-
 ci/ciimage/bionic/image.json         | 3 ++-
 ci/ciimage/cuda/image.json           | 5 ++++-
 ci/ciimage/fedora/image.json         | 3 ++-
 ci/ciimage/opensuse/image.json       | 3 ++-
 ci/ciimage/ubuntu-rolling/image.json | 3 ++-
 7 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/os_comp.yml b/.github/workflows/os_comp.yml
index dc1786000..fd716ce8d 100644
--- a/.github/workflows/os_comp.yml
+++ b/.github/workflows/os_comp.yml
@@ -85,7 +85,7 @@ jobs:
             CXX: 'g++'
 
     env:
-      MESON_CI_JOBNAME: linux-${{ github.job }}-${{ matrix.cfg.CC }}
+      MESON_CI_JOBNAME_UPDATE: linux-${{ github.job }}-${{ matrix.cfg.CC }}
 
     container:
       image: mesonbuild/ubuntu-rolling
@@ -116,6 +116,7 @@ jobs:
           fi
 
           source /ci/env_vars.sh
+          export MESON_CI_JOBNAME=$MESON_CI_JOBNAME_UPDATE
 
           update-alternatives --set x86_64-w64-mingw32-gcc /usr/bin/x86_64-w64-mingw32-gcc-posix
           update-alternatives --set x86_64-w64-mingw32-g++ /usr/bin/x86_64-w64-mingw32-g++-posix
diff --git a/ci/ciimage/arch/image.json b/ci/ciimage/arch/image.json
index 525407396..4a399d69e 100644
--- a/ci/ciimage/arch/image.json
+++ b/ci/ciimage/arch/image.json
@@ -1,6 +1,7 @@
 {
   "base_image": "archlinux:latest",
   "env": {
-    "CI": "1"
+    "CI": "1",
+    "MESON_CI_JOBNAME": "linux-arch-gcc"
   }
 }
diff --git a/ci/ciimage/bionic/image.json b/ci/ciimage/bionic/image.json
index d40090211..5df709e7e 100644
--- a/ci/ciimage/bionic/image.json
+++ b/ci/ciimage/bionic/image.json
@@ -2,6 +2,7 @@
   "base_image": "ubuntu:bionic",
   "env": {
     "CI": "1",
-    "DC": "gdc"
+    "DC": "gdc",
+    "MESON_CI_JOBNAME": "linux-bionic-gcc"
   }
 }
diff --git a/ci/ciimage/cuda/image.json b/ci/ciimage/cuda/image.json
index d395e7197..f422723c1 100644
--- a/ci/ciimage/cuda/image.json
+++ b/ci/ciimage/cuda/image.json
@@ -1,5 +1,8 @@
 {
   "base_image": "archlinux:latest",
   "args": ["--only", "cuda"],
-  "env": {}
+  "env": {
+    "CI": "1",
+    "MESON_CI_JOBNAME": "linux-cuda-gcc"
+  }
 }
diff --git a/ci/ciimage/fedora/image.json b/ci/ciimage/fedora/image.json
index ee9698014..c6fdc9e28 100644
--- a/ci/ciimage/fedora/image.json
+++ b/ci/ciimage/fedora/image.json
@@ -2,6 +2,7 @@
   "base_image": "fedora:latest",
   "env": {
     "CI":                "1",
-    "SKIP_STATIC_BOOST": "1"
+    "SKIP_STATIC_BOOST": "1",
+    "MESON_CI_JOBNAME": "linux-fedora-gcc"
   }
 }
diff --git a/ci/ciimage/opensuse/image.json b/ci/ciimage/opensuse/image.json
index a5e6d1ae4..6609aa08d 100644
--- a/ci/ciimage/opensuse/image.json
+++ b/ci/ciimage/opensuse/image.json
@@ -3,6 +3,7 @@
   "env": {
     "CI":                  "1",
     "SKIP_STATIC_BOOST":   "1",
-    "SINGLE_DUB_COMPILER": "1"
+    "SINGLE_DUB_COMPILER": "1",
+    "MESON_CI_JOBNAME": "linux-opensuse-gcc"
   }
 }
diff --git a/ci/ciimage/ubuntu-rolling/image.json b/ci/ciimage/ubuntu-rolling/image.json
index 038b9451c..f9f068d5a 100644
--- a/ci/ciimage/ubuntu-rolling/image.json
+++ b/ci/ciimage/ubuntu-rolling/image.json
@@ -2,6 +2,7 @@
   "base_image": "ubuntu:rolling",
   "env": {
     "CI": "1",
-    "DC": "gdc"
+    "DC": "gdc",
+    "MESON_CI_JOBNAME": "linux-ubuntu-rolling-gcc"
   }
 }